Merge remote-tracking branch 'origin/3.9' into 3.10

JumpMind · Nov 19, 2018 · e4a03e0 · e4a03e0
2 parents c5ffcfc + cf2dcd1
commit e4a03e0
Show file tree

Hide file tree

Showing 2 changed files with 9 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
@@ -589,12 +589,14 @@ protected boolean producesCommonBatches(Channel channel, String nodeGroupId, Lis
             if (producesCommonBatches && triggerRouters != null) {
                 List<TriggerRouter> testableTriggerRouters = new ArrayList<TriggerRouter>();
                 for (TriggerRouter triggerRouter : triggerRouters) {
-                    if (triggerRouter.getTrigger().getChannelId().equals(channel.getChannelId())) {
+                    if (triggerRouter.getTrigger().getChannelId().equals(channelId)) {
                         testableTriggerRouters.add(triggerRouter);
                     } else {
                         /*
-                         * Add any trigger router that is in another channel, but is
-                         * for a table that is in the current channel
+                         * This trigger is not on this channel. If there is
+                         * another trigger on this channel for the same table
+                         * AND this trigger is syncing to this node, then
+                         * consider it to check on common batch mode
                          */
                         String anotherChannelTableName = triggerRouter.getTrigger()
                                 .getFullyQualifiedSourceTableName();
@@ -603,14 +605,14 @@ protected boolean producesCommonBatches(Channel channel, String nodeGroupId, Lis
                                     .getTrigger()
                                     .getFullyQualifiedSourceTableName();
                             String currentChannelId = triggerRouter2.getTrigger().getChannelId();
-                            if (anotherChannelTableName
-                                    .equals(currentTableName) && currentChannelId.equals(channelId)) {
+                            if (anotherChannelTableName.equals(currentTableName) && currentChannelId.equals(channelId)
+                                    && triggerRouter.getRouter().getNodeGroupLink().getTargetNodeGroupId()
+                                            .equals(triggerRouter2.getRouter().getNodeGroupLink().getSourceNodeGroupId())) {
                                 testableTriggerRouters.add(triggerRouter);
                             }
                         }
                     }
                 }         
-
                 for (TriggerRouter triggerRouter : testableTriggerRouters) {
                     boolean isDefaultRouter = "default".equals(triggerRouter.getRouter().getRouterType());
                     /*

diff --git a/symmetric-server/src/main/deploy/bin/setenv.bat b/symmetric-server/src/main/deploy/bin/setenv.bat
@@ -21,7 +21,7 @@
 
 @echo off
 
-pushd %~dp0..
+pushd "%~dp0.."
 for /f "delims=" %%i in ('echo %CD%') do set SYM_HOME=%%i
 popd