Bug 7018: Fix NPE when SMR and no locators

Change-Id: I2ef46e25509f40637c6a29bee81855dd383ac48c
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java
index dc9ffa71d749ff33a0ad2546f483338bbe5709f3..2c95e0d16b69e3a0b5e1eb60589812d905fc5dfb 100644 (file)
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java
@@ -236,6 +236,11 @@ public class MapResolver implements IMapResolverAsync {
     }
 
     private boolean locatorsNeedFixing(List<LocatorRecord> locatorRecords) {
+        // no locators - no fixing needed ;)
+        if (locatorRecords == null) {
+            return false;
+        }
+
         for (LocatorRecord record : locatorRecords) {
             if (record.getRloc().getAddress() instanceof ExplicitLocatorPath) {
                 return true;