Merge "Bug 4733 - impl/SecurityServicesImpl.java: null pointer exception"

[netvirt.git] / openstack / net-virt / src / main / java / org / opendaylight / ovsdb / openstack / netvirt / impl / SecurityGroupCacheManagerImpl.java

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityGroupCacheManagerImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityGroupCacheManagerImpl.java
index d6e41cc2298d4b425299e6761767d142a1b1ade8..e77eca2844a5e0b8c5ca945c9195d435754d4cb5 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityGroupCacheManagerImpl.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityGroupCacheManagerImpl.java
@@ -45,6 +45,10 @@ public class SecurityGroupCacheManagerImpl implements ConfigInterface, SecurityG
     public void portAdded(String securityGroupUuid, String portUuid) {
         LOG.debug("In portAdded securityGroupUuid:" + securityGroupUuid + " portUuid:" + portUuid);
         NeutronPort port = neutronPortCache.getPort(portUuid);
+        if (port == null) {
+            LOG.debug("In portAdded no neutron port found:" + " portUuid:" + portUuid);
+            return;
+        }
         processPortAdded(securityGroupUuid,port);
     }
 
@@ -52,6 +56,10 @@ public class SecurityGroupCacheManagerImpl implements ConfigInterface, SecurityG
     public void portRemoved(String securityGroupUuid, String portUuid) {
         LOG.debug("In portRemoved securityGroupUuid:" + securityGroupUuid + " portUuid:" + portUuid);
         NeutronPort port = neutronPortCache.getPort(portUuid);
+        if (port == null) {
+            LOG.debug("In portRemoved no neutron port found:" + " portUuid:" + portUuid);
+            return;
+        }
         processPortRemoved(securityGroupUuid,port);
     }