Avoid sending duplicate-data when subscription is set up to use provi…

…ded codespaces.
entur · Oct 15, 2024 · c25c4b9 · c25c4b9
1 parent bd1ffe4
commit c25c4b9
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/main/java/no/rutebanken/anshar/routes/siri/handlers/SiriHandler.java b/src/main/java/no/rutebanken/anshar/routes/siri/handlers/SiriHandler.java
@@ -409,7 +409,6 @@ private void processSiriClientRequest(String subscriptionId, InputStream xml)
                                                         subscriptionSetup.getDatasetId(),
                                                         sx.getSituations().getPtSituationElements()
                                                     ));
-                                                    serverSubscriptionManager.pushUpdatesAsync(subscriptionSetup.getSubscriptionType(), addedOrUpdated, subscriptionSetup.getDatasetId());
                                                 }
                                             }
                                         }
@@ -419,6 +418,10 @@ private void processSiriClientRequest(String subscriptionId, InputStream xml)
                     }
                     deliveryContainsData = addedOrUpdated.size() > 0;
 
+                    if (!subscriptionSetup.isUseProvidedCodespaceId()) {
+                        serverSubscriptionManager.pushUpdatesAsync(subscriptionSetup.getSubscriptionType(), addedOrUpdated, subscriptionSetup.getDatasetId());
+                    }
+
                     subscriptionManager.incrementObjectCounter(subscriptionSetup, addedOrUpdated.size());
 
                     logger.info("Active SX-elements: {}, current delivery: {}, {}", situations.getSize(), addedOrUpdated.size(), subscriptionSetup);
@@ -476,7 +479,9 @@ private void processSiriClientRequest(String subscriptionId, InputStream xml)
 
                     deliveryContainsData = deliveryContainsData || (addedOrUpdated.size() > 0);
 
-                    serverSubscriptionManager.pushUpdatesAsync(subscriptionSetup.getSubscriptionType(), addedOrUpdated, subscriptionSetup.getDatasetId());
+                    if (!subscriptionSetup.isUseProvidedCodespaceId()) {
+                        serverSubscriptionManager.pushUpdatesAsync(subscriptionSetup.getSubscriptionType(), addedOrUpdated, subscriptionSetup.getDatasetId());
+                    }
 
                     subscriptionManager.incrementObjectCounter(subscriptionSetup, addedOrUpdated.size());
 
@@ -532,7 +537,9 @@ private void processSiriClientRequest(String subscriptionId, InputStream xml)
 
                     deliveryContainsData = deliveryContainsData || (addedOrUpdated.size() > 0);
 
-                    serverSubscriptionManager.pushUpdatesAsync(subscriptionSetup.getSubscriptionType(), addedOrUpdated, subscriptionSetup.getDatasetId());
+                    if (!subscriptionSetup.isUseProvidedCodespaceId()) {
+                        serverSubscriptionManager.pushUpdatesAsync(subscriptionSetup.getSubscriptionType(), addedOrUpdated, subscriptionSetup.getDatasetId());
+                    }
 
                     subscriptionManager.incrementObjectCounter(subscriptionSetup, addedOrUpdated.size());