Subscribe to live data after set up the listeners

romanpbm · romanpbm · commit 6d3c084e39d5 · 2024-02-22T13:47:42.000+02:00
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/Connector.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/Connector.java
@@ -68,13 +68,14 @@ public void subscribeToLiveData(String generatorName, EventLoop eventLoop, Strin
 
                 // Trying to subscribe for live events.
                 // Broadcasting will notify us of a successful subscription through the LiveConnectionListener.
-                broadcasterConsumer.subscribeToLiveData(providerName, generatorInfo.getGeneratorName(),
-                        Event.class, eventListener, subscriptionListener);
+
                 if (doesRequireFiltering) {
-                    broadcasterConsumer.setListenersForGenerator(providerName, generatorName, filterListener, new SettingsListener());
+                    broadcasterConsumer.setListenersForGenerator(providerName, generatorName, filterListener, new SettingsListener(eventLoop, generatorName));
                 } else {
                     broadcasterConsumer.setListenersForGenerator(providerName, generatorName, null, null);
                 }
+                broadcasterConsumer.subscribeToLiveData(providerName, generatorInfo.getGeneratorName(),
+                        Event.class, eventListener, subscriptionListener);
             });
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -68,13 +68,14 @@ public void subscribeToLiveData(String generatorName, EventLoop eventLoop, Strin`
`68`	`68`
`69`	`69`	`// Trying to subscribe for live events.`
`70`	`70`	`// Broadcasting will notify us of a successful subscription through the LiveConnectionListener.`
`71`		`- broadcasterConsumer.subscribeToLiveData(providerName, generatorInfo.getGeneratorName(),`
`72`		`- Event.class, eventListener, subscriptionListener);`
	`71`	`+`
`73`	`72`	`if (doesRequireFiltering) {`
`74`		`- broadcasterConsumer.setListenersForGenerator(providerName, generatorName, filterListener, new SettingsListener());`
	`73`	`+ broadcasterConsumer.setListenersForGenerator(providerName, generatorName, filterListener, new SettingsListener(eventLoop, generatorName));`
`75`	`74`	`} else {`
`76`	`75`	`broadcasterConsumer.setListenersForGenerator(providerName, generatorName, null, null);`
`77`	`76`	`}`
	`77`	`+ broadcasterConsumer.subscribeToLiveData(providerName, generatorInfo.getGeneratorName(),`
	`78`	`+ Event.class, eventListener, subscriptionListener);`
`78`	`79`	`});`
`79`	`80`	`}`
`80`	`81`	`}`