fixed bug JPPF-594

Author: lolocohen

server/src/java/org/jppf/server/protocol/ServerJob.java

@@ -258,8 +258,7 @@ public void taskCompleted(final ServerTaskBundleNode bundle, final Throwable thr
     if (debugEnabled) log.debug("submissionStatus={}, clientBundles={} for {}", getSubmissionStatus(), clientBundles.size(), this);
   }
 
-  /**    //NioHelper.getGlobalexecutor().execute(r);
-
+  /**
    * Perform the necessary actions for when this job has been cancelled.
    */
   private void handleCancelledStatus() {
@@ -287,8 +286,9 @@ public void cancelDispatch(final ServerTaskBundleNode nodeBundle) {
 
   /**
    * Perform the necessary actions for when this job has been cancelled.
+   * @return a mapping of client bundles to the tasks that belong to them and were cacelled.
    */
-  private void handleCancelledTasks() {
+  private CollectionMap<ServerTaskBundleClient, ServerTask> handleCancelledTasks() {
     if (debugEnabled) log.debug("cancelling tasks for {}", this);
     final CollectionMap<ServerTaskBundleClient, ServerTask> clientMap = new SetIdentityMap<>();
     for (final ServerTask task: tasks) {
@@ -297,32 +297,33 @@ private void handleCancelledTasks() {
         clientMap.putValue(task.getBundle(), task);
       }
     }
-    clientMap.forEach((clientBundle, tasks) -> clientBundle.resultReceived(tasks));
+    return clientMap;
   }
 
   /**
    * Cancel this job.
    * @param driver reference to the JPPF driver.
-   * @param mayInterruptIfRunning <code>true</code> if the job may be interrupted.
-   * @return <code>true</code> if the job was effectively cncelled, <code>false</code> if it was already cancelled previously.
+   * @param mayInterruptIfRunning {@code true} if the job may be interrupted.
+   * @return {@code true} if the job was effectively cancelled, {@code false} if it was already cancelled previously.
    */
   public boolean cancel(final JPPFDriver driver, final boolean mayInterruptIfRunning) {
     if (debugEnabled) log.debug("request to cancel {}", this);
     boolean result = false;
+    CollectionMap<ServerTaskBundleClient, ServerTask> clientMap = null;
     lock.lock();
     try {
       if (setCancelled(mayInterruptIfRunning)) {
         handleCancelledStatus();
-        if (!getSLA().isBroadcastJob()) handleCancelledTasks();
+        if (!getSLA().isBroadcastJob()) clientMap = handleCancelledTasks();
         setSubmissionStatus(SubmissionStatus.COMPLETE);
-        //taskCompleted(null, null);
         final NodeReservationHandler handler = driver.getAsyncNodeNioServer().getNodeReservationHandler();
         handler.onJobCancelled(this);
         result = true;
       }
     } finally {
       lock.unlock();
     }
+    if (clientMap != null) clientMap.forEach((clientBundle, tasks) -> clientBundle.resultReceived(tasks));
     if (result) setSubmissionStatus(SubmissionStatus.ENDED);
     return result;
   }