Fix LispMappingService closing CSS provider

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

diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/LispMappingService.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/LispMappingService.java
index 968b2640881f6fe0138817d6d44d04dc99f2cae9..f3bb5d7680a71e8d77e2c815ceac9962471bb503 100644 (file)
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/LispMappingService.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/LispMappingService.java
@@ -97,6 +97,7 @@ public class LispMappingService implements IFlowMapping, IMapRequestResultHandle
     private final NotificationService notificationService;
     private final Registration rpcRegistration;
     private final Registration listenerRegistration;
+    private final Registration cssRegistration;
 
     @Inject
     @Activate
@@ -123,7 +124,7 @@ public class LispMappingService implements IFlowMapping, IMapRequestResultHandle
 
         mapResolver = new MapResolver(mapService, smr, elpPolicy, this);
         mapServer = new MapServer(mapService, smr, this, notificationService);
-        clusterSingletonService.registerClusterSingletonService(this);
+        cssRegistration = clusterSingletonService.registerClusterSingletonService(this);
         mapResolver.setSmrNotificationListener((ISmrNotificationListener) mapServer);
         LOG.info("LISP (RFC6830) Mapping Service initialized");
     }
@@ -310,6 +311,7 @@ public class LispMappingService implements IFlowMapping, IMapRequestResultHandle
     @Override
     public void close() throws Exception {
         destroy();
+        cssRegistration.close();
         clusterSingletonService.close();
         rpcRegistration.close();
         listenerRegistration.close();