Merge "Rename static final variable 'logger' to 'LOG'"

diff --cc mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServer.java
index ef5166142fb2839636558ec904b284e7406ffdbb,310b9f43e4ce1c8af7f2424e73facbc62a163e06..a1a8dfd43d0bdfb33efe854104a162c45991c0eb
--- 1/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServer.java
--- 2/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
@@@ -142,17 -142,13 +142,17 @@@ public class MapServer extends Abstract
                      HashSet<MappingServiceSubscriberRLOC> subscribers = getSubscribers(eidRecord.getLispAddressContainer(), eidRecord.getMaskLength());
                      if (subscribers != null) {
                          MapRequest mapRequest = buildSMR(eidRecord);
-                         logger.trace("Built SMR packet: " + mapRequest.toString());
+                         LOG.trace("Built SMR packet: " + mapRequest.toString());
                          for (MappingServiceSubscriberRLOC rloc : subscribers) {
                              if (rloc.timedOut()) {
-                                 logger.trace("Lazy removing expired subscriber entry " + rloc.toString());
+                                 LOG.trace("Lazy removing expired subscriber entry " + rloc.toString());
                                  subscribers.remove(rloc);
                              } else {
 -                                callback.handleSMR(mapRequest, rloc.getSrcRloc());
 +                                try {
 +                                    callback.handleSMR(mapRequest, rloc.getSrcRloc());
 +                                } catch (Exception e) {
 +                                    logger.error("Errors encountered while handling SMR:" + e.getStackTrace());
 +                                }
                              }
                          }
                          IMappingServiceKey key = MappingServiceKeyUtil.generateMappingServiceKey(eidRecord.getLispAddressContainer(),