0006185: Unnecessary unrouted batch appears along with routed batch

JumpMind · Jan 8, 2024 · 37f5291 · 37f5291
1 parent 6267d7c
commit 37f5291
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RouterService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RouterService.java
@@ -901,8 +901,6 @@ protected int routeData(ProcessInfo processInfo, Data data, ChannelRouterContext
             table = buildTableFromTriggerHistory(data.getTriggerHistory());
         }
         if (triggerRouters != null && triggerRouters.size() > 0) {
-            boolean isUnrouted = false;
-            boolean alreadyInsertedUnrouted = false;
             for (TriggerRouter triggerRouter : triggerRouters) {
                 DataMetaData dataMetaData = new DataMetaData(data, table, triggerRouter.getRouter(),
                         context.getChannel());
@@ -964,17 +962,17 @@ protected int routeData(ProcessInfo processInfo, Data data, ChannelRouterContext
                         nodeIds.remove(engine.getNodeService().findIdentityNodeId());
                     }
                 }
-                isUnrouted = (nodeIds == null || nodeIds.size() == 0);
-                if (!isUnrouted || !alreadyInsertedUnrouted) {
+                if (nodeIds != null && nodeIds.size() > 0) {
                     numberOfDataEventsInserted += insertDataEvents(processInfo, context, dataMetaData, nodeIds);
-                    if (isUnrouted) {
-                        alreadyInsertedUnrouted = true;
-                    }
                 }
                 if (context.isForceNonCommon()) {
                     context.setForceNonCommon(false);
                 }
             }
+            if (numberOfDataEventsInserted == 0) {
+                DataMetaData dataMetaData = new DataMetaData(data, table, null, context.getChannel());
+                numberOfDataEventsInserted += insertDataEvents(processInfo, context, dataMetaData, null);
+            }
         } else {
             Integer triggerHistId = data.getTriggerHistory() != null ? data.getTriggerHistory().getTriggerHistoryId() : -1;
             CounterStat counterStat = missingTriggerRouter.get(triggerHistId);