Topic Manager: Remove Remote Router Subscription will not stop announ…

…cing topics to that router
iitsoftware · May 27, 2022 · d4f4b4a · d4f4b4a
1 parent d205467
commit d4f4b4a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...lets/sys_topicmanager/src/main/java/com/swiftmq/impl/topic/standard/TopicManagerImpl.java b/...lets/sys_topicmanager/src/main/java/com/swiftmq/impl/topic/standard/TopicManagerImpl.java
@@ -778,6 +778,8 @@ protected void startup(Configuration config)
             ctx.remoteSubscriberList.setEntityRemoveListener(new EntityRemoveListener() {
                 public void onEntityRemove(Entity parent, Entity delEntity) throws EntityRemoveException {
                     removeRemoteSubscriptions(delEntity.getName());
+                    if (ctx.announceSender != null)
+                        ctx.announceSender.routerRemoved(delEntity.getName());
                 }
             });
             new TopicAnnounceSender(ctx);

diff --git a/...icmanager/src/main/java/com/swiftmq/impl/topic/standard/announce/TopicAnnounceSender.java b/...icmanager/src/main/java/com/swiftmq/impl/topic/standard/announce/TopicAnnounceSender.java
@@ -129,6 +129,12 @@ public void destinationAdded(Route route) {
         }
     }
 
+    public void routerRemoved(String routername) {
+        if (ctx.traceSpace.enabled)
+            ctx.traceSpace.trace(ctx.topicManager.getName(), toString() + "/topicCreated: " + routername);
+        pipelineQueue.enqueue(new PODestinationRemoved(routername));
+    }
+
     public void topicCreated(String topicName) {
         if (ctx.traceSpace.enabled)
             ctx.traceSpace.trace(ctx.topicManager.getName(), toString() + "/topicCreated: " + topicName);
@@ -237,7 +243,7 @@ public void visit(PODestinationAdded po) {
 
     public void visit(PODestinationRemoved po) {
         if (ctx.traceSpace.enabled) ctx.traceSpace.trace(ctx.topicManager.getName(), toString() + "/" + po);
-        RemoteTopicManager rtm = (RemoteTopicManager) rtmList.get(po.getDestination());
+        RemoteTopicManager rtm = (RemoteTopicManager) rtmList.remove(po.getDestination());
         if (rtm != null) {
             rtm.close();
         }