bug JPPF-537 adding missing cancellation checks (b_5_2)

jppf-grid · Jul 4, 2018 · c7f2689 · c7f2689
1 parent 70d6ca5
commit c7f2689
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/client/src/java/org/jppf/client/balancer/AbstractClientJob.java b/client/src/java/org/jppf/client/balancer/AbstractClientJob.java
@@ -377,7 +377,7 @@ public void removeChannel(final ExecutorChannel channel) {
   public boolean acceptsChannel(final ExecutorChannel channel) {
     if (traceEnabled) log.trace(String.format("job '%s' : cancelled=%b, cancelling=%b, pending=%b, expired=%b, nb channels=%d, max channels=%d",
       job.getName(), isCancelled(), isCancelling(), isPending(), isJobExpired(), channelsCount.get(), clientSla.getMaxChannels()));
-    if (isCancelled() || isPending() || isJobExpired() || (channelsCount.get() >= clientSla.getMaxChannels())) return false;
+    if (isCancelling() || isCancelled() || isPending() || isJobExpired() || (channelsCount.get() >= clientSla.getMaxChannels())) return false;
     ExecutionPolicy policy = clientSla.getExecutionPolicy();
     boolean b = true;
     if (policy != null) {
@@ -428,4 +428,12 @@ boolean isChildBroadcastJob() {
   public boolean isCancelling() {
     return (job == null) ? false : job.getCancellingFlag().get();
   }
+
+  /**
+   * Whether this job is being cancelled or has already been cancelled.
+   * @return {@code true} a cancellation request is being or has been processed, {@code false} otherwise.
+   */
+  public boolean isCancellingOrCancelled() {
+    return isCancelling() || isCancelled();
+  }
 }
diff --git a/client/src/java/org/jppf/client/balancer/queue/TaskQueueChecker.java b/client/src/java/org/jppf/client/balancer/queue/TaskQueueChecker.java
@@ -225,12 +225,13 @@ public boolean dispatch() {
           Iterator<ClientJob> it = queue.iterator();
           while ((channel == null) && it.hasNext() && !idleChannels.isEmpty()) {
             ClientJob bundleWrapper = it.next();
-            if (bundleWrapper.isCancelled() || bundleWrapper.isCancelling()) continue;
+            if (bundleWrapper.isCancellingOrCancelled()) continue;
             channel = findIdleChannelIndex(bundleWrapper);
+            if (bundleWrapper.isCancellingOrCancelled()) continue;
             if (channel != null) selectedBundle = bundleWrapper;
           }
           if (debugEnabled) log.debug((channel == null) ? "no channel found for bundle" : "channel found for bundle: " + channel);
-          if (channel != null) {
+          if ((channel != null) && !selectedBundle.isCancellingOrCancelled()) {
             dispatchJobToChannel(channel, selectedBundle);
             dispatched = true;
           }