From fa233cca874f693c71fef9153ef7fe7df79cf33b Mon Sep 17 00:00:00 2001 From: Daniel Warneke Date: Sun, 12 Aug 2012 21:32:37 +0200 Subject: [PATCH] Fixed bug in JobManager shutdown method --- .../eu/stratosphere/nephele/jobmanager/JobManager.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nephele/nephele-server/src/main/java/eu/stratosphere/nephele/jobmanager/JobManager.java b/nephele/nephele-server/src/main/java/eu/stratosphere/nephele/jobmanager/JobManager.java index 41f9bc1b80ac1..7fae2906680a5 100644 --- a/nephele/nephele-server/src/main/java/eu/stratosphere/nephele/jobmanager/JobManager.java +++ b/nephele/nephele-server/src/main/java/eu/stratosphere/nephele/jobmanager/JobManager.java @@ -166,7 +166,9 @@ public class JobManager implements DeploymentManager, ExtendedManagementProtocol private final static int FAILURERETURNCODE = -1; - private final AtomicBoolean isShutDown = new AtomicBoolean(false); + private final AtomicBoolean isShutdownInProgress = new AtomicBoolean(false); + + private volatile boolean isShutDown = false; /** * Constructs a new job manager, starts its discovery service and its IPC service. @@ -305,7 +307,7 @@ public void runTaskLoop() { public void shutdown() { - if (this.isShutDown.compareAndSet(false, true)) { + if (!this.isShutdownInProgress.compareAndSet(false, true)) { return; } @@ -355,7 +357,7 @@ public void shutdown() { this.scheduler.shutdown(); } - this.isShutDown.set(true); + this.isShutDown = true; LOG.debug("Shutdown of job manager completed"); } @@ -1089,7 +1091,7 @@ public void run() { */ public boolean isShutDown() { - return this.isShutDown.get(); + return this.isShutDown; } /**