0000971: Push / Pull threads should run in Job's thread when jobs.syn…

…chronized.enable is true
JumpMind · Jan 4, 2013 · eb5fa08 · eb5fa08
1 parent d4f85bb
commit eb5fa08
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...tric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeCommunicationService.java b/...tric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeCommunicationService.java
@@ -228,7 +228,7 @@ public boolean execute(final NodeCommunication nodeCommunication, RemoteNodeStat
             nodeCommunication.setLockingServerId(clusterService.getServerId());
             final RemoteNodeStatus status = statuses.add(nodeCommunication.getNode());
             ThreadPoolExecutor service = getExecutor(nodeCommunication.getCommunicationType());
-            service.execute(new Runnable() {
+            Runnable r = new Runnable() {
                 public void run() {
                     long ts = System.currentTimeMillis();
                     boolean failed = false;
@@ -262,7 +262,12 @@ public void run() {
                         save(nodeCommunication);
                     }
                 }
-            });
+            };
+            if (parameterService.is(ParameterConstants.SYNCHRONIZE_ALL_JOBS)) {
+                    r.run();
+            } else {
+                service.execute(r);
+            }            
         }
         return locked;
     }