ClusterSingletonProvider unfortunately exposes its close method -- and
LispMappingService closes that instead of its registration. Fix that.
Change-Id: Ic73320257998952d2ad8ec0e78414a7b4fb2d256
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
private final NotificationService notificationService;
private final Registration rpcRegistration;
private final Registration listenerRegistration;
private final NotificationService notificationService;
private final Registration rpcRegistration;
private final Registration listenerRegistration;
+ private final Registration cssRegistration;
mapResolver = new MapResolver(mapService, smr, elpPolicy, this);
mapServer = new MapServer(mapService, smr, this, notificationService);
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");
}
mapResolver.setSmrNotificationListener((ISmrNotificationListener) mapServer);
LOG.info("LISP (RFC6830) Mapping Service initialized");
}
@Override
public void close() throws Exception {
destroy();
@Override
public void close() throws Exception {
destroy();
+ cssRegistration.close();
clusterSingletonService.close();
rpcRegistration.close();
listenerRegistration.close();
clusterSingletonService.close();
rpcRegistration.close();
listenerRegistration.close();
@Mock(name = "tlsMapRequest") private static ThreadLocal<Pair<MapRequest, TransportAddress>> tlsMapRequestMock;
@Mock private static Registration rpcRegistration;
@Mock(name = "listenerRegistration") private static Registration listenerRegistration;
@Mock(name = "tlsMapRequest") private static ThreadLocal<Pair<MapRequest, TransportAddress>> tlsMapRequestMock;
@Mock private static Registration rpcRegistration;
@Mock(name = "listenerRegistration") private static Registration listenerRegistration;
+ @Mock(name = "cssRegistration") private static Registration cssRegistration;
private final NotificationService notificationService = Mockito.mock(NotificationService.class);
private final RpcProviderService rpcProviderService = Mockito.mock(RpcProviderService.class);
private final NotificationService notificationService = Mockito.mock(NotificationService.class);
private final RpcProviderService rpcProviderService = Mockito.mock(RpcProviderService.class);
public void closeTest() throws Exception {
setMock("rpcRegistration", rpcRegistration);
setMock("listenerRegistration", listenerRegistration);
public void closeTest() throws Exception {
setMock("rpcRegistration", rpcRegistration);
setMock("listenerRegistration", listenerRegistration);
+ setMock("cssRegistration", cssRegistration);
lispMappingService.close();
Mockito.verify(rpcRegistration).close();
Mockito.verify(listenerRegistration).close();
lispMappingService.close();
Mockito.verify(rpcRegistration).close();
Mockito.verify(listenerRegistration).close();
- Mockito.verify(clusterSingletonService).close();
+ Mockito.verify(cssRegistration).close();
assertNull(getField("mapResolver"));
assertNull(getField("mapServer"));
}
assertNull(getField("mapResolver"));
assertNull(getField("mapServer"));
}