Bug 5258: Fix NPE

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

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 e7e4974f74843a34af30f17512040bc22786291d..abae8ae6ba71fb4e9397ebaf97713c0be3d34ebd 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
@@ -150,7 +150,9 @@ public class MapServer implements IMapServerAsync, OdlMappingserviceListener {
                     mergedMappings.add(new MappingRecordItemBuilder().setMappingRecord(currentRecord).build());
                     Set<IpAddress> sourceRlocs = (Set<IpAddress>) mapService.getData(MappingOrigin.Southbound,
                             mapping.getEid(), SubKeys.SRC_RLOCS);
-                    notifyRlocs.addAll(sourceRlocs);
+                    if (sourceRlocs != null) {
+                        notifyRlocs.addAll(sourceRlocs);
+                    }
                 }
                 MapNotifyBuilderHelper.setFromMapRegisterAndMappingRecordItems(builder, mapRegister, mergedMappings);
                 rlocs = getTransportAddresses(notifyRlocs);