1 files changed, 15 insertions, 15 deletions
diff --git a/rms/org.eclipse.ptp.rm.jaxb.core/src/org/eclipse/ptp/rm/jaxb/core/runnable/JobStatusMap.java b/rms/org.eclipse.ptp.rm.jaxb.core/src/org/eclipse/ptp/rm/jaxb/core/runnable/JobStatusMap.java
index 7ab23d2bb..3186566e9 100644
--- a/rms/org.eclipse.ptp.rm.jaxb.core/src/org/eclipse/ptp/rm/jaxb/core/runnable/JobStatusMap.java
+++ b/rms/org.eclipse.ptp.rm.jaxb.core/src/org/eclipse/ptp/rm/jaxb/core/runnable/JobStatusMap.java
@@ -40,6 +40,21 @@ public class JobStatusMap extends Thread implements IJAXBNonNLSConstants {
 	}
 
 	/**
+	 * Synchronized cancel. External calls are premature and thus should not
+	 * block waiting for the remote files if any.
+	 * 
+	 * @param jobId
+	 *            either internal UUID or scheduler id for the job.
+	 */
+	public ICommandJobStatus cancelAndRemove(String jobId) {
+		ICommandJobStatus status = null;
+		synchronized (map) {
+			remove(jobId, false);
+		}
+		return status;
+	}
+
+	/**
 	 * 
 	 * @param jobId
 	 *            either internal UUID or scheduler id for the job.
@@ -64,21 +79,6 @@ public class JobStatusMap extends Thread implements IJAXBNonNLSConstants {
 	}
 
 	/**
-	 * Synchronized remove. External calls are premature and thus should not
-	 * block waiting for the remote files if any.
-	 * 
-	 * @param jobId
-	 *            either internal UUID or scheduler id for the job.
-	 */
-	public ICommandJobStatus removeJobStatus(String jobId) {
-		ICommandJobStatus status = null;
-		synchronized (map) {
-			status = remove(jobId, false);
-		}
-		return status;
-	}
-
-	/**
 	 * Thread daemon for cleanup on the map. Eliminates stray completed state
 	 * information, and also starts the stream proxies on jobs which have been
 	 * submitted to a scheduler and have become active.