Bug-6621: ModifiedNodeDoesNotExistException encountered while building Linkstate...

[bgpcep.git] / bgp / topology-provider / src / main / java / org / opendaylight / bgpcep / bgp / topology / provider / AbstractReachabilityTopologyBuilder.java

diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java
index 2914a3ec061463c23ade98a1e1dd23f20f9f6d3c..111f48ca82b86b2091c21cafd053b7bea53297ee 100644 (file)
--- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java
+++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java
@@ -142,6 +142,11 @@ abstract class AbstractReachabilityTopologyBuilder<T extends Route> extends Abst
 
     @Override
     protected final void removeObject(final ReadWriteTransaction trans, final InstanceIdentifier<T> id, final T value) {
+        if (value == null) {
+            LOG.error("Empty before-data received in delete data change notification for instance id {}", id);
+            return;
+        }
+
         final NodeId ni = advertizingNode(getAttributes(value));
         if (ni == null) {
             return;
@@ -174,4 +179,9 @@ abstract class AbstractReachabilityTopologyBuilder<T extends Route> extends Abst
             }
         }
     }
+
+    @Override
+    protected void clearTopology() {
+        this.nodes.clear();
+    }
 }