Fix a NPE in SmrScheduler

[lispflowmapping.git] / mappingservice / implementation / src / main / java / org / opendaylight / lispflowmapping / implementation / lisp / MapServer.java

diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServer.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServer.java
index 36d823bc2dab2840e17594d5ec830ab090e40149..4fda63c955e102246dd44de2ce9c6a69510e9e29 100644 (file)
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServer.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServer.java
@@ -418,6 +418,10 @@ public class MapServer implements IMapServerAsync, OdlMappingserviceListener, IS
 
             private void cancelAndRemove(IpAddressBinary subscriberAddress) {
                 final Map<Eid, ScheduledFuture<?>> eidFutureMap = subscriberFutureMap.get(subscriberAddress);
+                if (eidFutureMap == null) {
+                    LOG.warn("Couldn't find subscriber {} in SMR scheduler internal list", subscriberAddress);
+                    return;
+                }
                 final Eid eid = mrb.getSourceEid().getEid();
                 if (eidFutureMap.containsKey(eid)) {
                     eidFutureMap.get(eid).cancel(false);