Bug 4932: Sending SMR to the old EID key when a more specific is being registered...

Change-Id: I6a26c4230a49993ebd3442ffe4b6d46b19b61554
Signed-off-by: vermagan@cisco.com <vermagan@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 7b53d3ab1b402be595c62cef88e87c20eb06aa80..9d0af350ad858416f763510c8988b8843484b597 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
@@ -104,12 +104,13 @@ public class MapServer implements IMapServerAsync, OdlMappingserviceListener {
             }
             MappingRecord oldMapping = (MappingRecord) mapService.getMapping(MappingOrigin.Southbound,
                     mapping.getEid());
-            mapService.addMapping(MappingOrigin.Southbound, mapping.getEid(), getSiteId(mapRegister), mapping);
+
             if (subscriptionService && !mapping.equals(oldMapping)) {
                 LOG.debug("Sending SMRs for subscribers of {}", mapping.getEid());
                 Set<SubscriberRLOC> subscribers = getSubscribers(mapping.getEid());
                 sendSmrs(mapping, subscribers);
             }
+            mapService.addMapping(MappingOrigin.Southbound, mapping.getEid(), getSiteId(mapRegister), mapping);
         }
         if (!failed) {
             MapNotifyBuilder builder = new MapNotifyBuilder();