Bug 8793: Null Pointer Exceptions in Carbon CSIT

This commit fixes NPE observed in bindAcl() of AclService

Change-Id: I7397677f0e63a56e0e023eb4b2697ae1ef095714
Signed-off-by: Shashidhar Raja <shashidharr@altencalsoftlabs.com>

diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java b/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java
index 3758c31b06ceaa00ab36e574d5b7841299b378cd..c57fc8092e459485333a93c92c8df95d5435b8fa 100644 (file)
--- a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java
+++ b/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java
@@ -104,7 +104,9 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener {
             return false;
         }
         bindService(port);
-        updateRemoteAclFilterTable(port, NwConstants.ADD_FLOW);
+        if (port.getDpId() != null) {
+            updateRemoteAclFilterTable(port, NwConstants.ADD_FLOW);
+        }
         return true;
     }