Merge "Fix for BUG 3623"

diff --git a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/InterfaceManager.java b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/InterfaceManager.java
index 84d4350acbb47d840e5430473c2c06cfc8b148d2..d03fd5f6d313260f53d802a53be9289c96d85425 100644 (file)
--- a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/InterfaceManager.java
+++ b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/InterfaceManager.java
@@ -281,11 +281,9 @@ public class InterfaceManager extends AbstractDataChangeListener<Interface> impl
             if(ncId != null) {
                 mapNcToInterfaceName.remove(ncId);
                 if(delInterface.getType().isAssignableFrom(L3tunnel.class)) {
-                    Node node = getNodeFromDataStore(delInterface);
-                    if((node != null) &&(node.getNodeConnector().isEmpty())) {
-                        dbDpnEndpoints.remove(node.getId());
-                        LOG.trace("dbDpnEndpoints: {}",dbDpnEndpoints);
-                    }
+                    NodeId nodeId = getNodeIdFromNodeConnectorId(ncId);
+                    dbDpnEndpoints.remove(nodeId);
+                    LOG.trace("dbDpnEndpoints: {}",dbDpnEndpoints);
                 }
             }
         }