commit 4c88fcc95bee706bc830757d3d5e95b1b06e2011
author Steve Loughran <stevel@apache.org> Mon Nov 10 16:47:27 2014 +0000
committer Steve Loughran <stevel@apache.org> Mon Nov 10 22:48:09 2014 +0000
tree ed7b9b8c418f3037d834e0e6037298b5968c9224
parent 61c0bd7764d71a36c7db5987449441f5ad19a43c

SLIDER-622 possible bug/race in EndOfServiceWaiter

slider-core/src/main/java/org/apache/slider/server/services/utility/EndOfServiceWaiter.java

diff --git a/slider-core/src/main/java/org/apache/slider/server/services/utility/EndOfServiceWaiter.java b/slider-core/src/main/java/org/apache/slider/server/services/utility/EndOfServiceWaiter.java
index 6e8add1..4a57133 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/utility/EndOfServiceWaiter.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/utility/EndOfServiceWaiter.java
@@ -35,6 +35,7 @@
 
   private final AtomicBoolean finished = new AtomicBoolean(false);
   private final String name;
+  private Service service;
 
   /**
    * Wait for a service; use the service name as this instance's name
@@ -52,6 +53,7 @@
    */
   public EndOfServiceWaiter(String name, Service service) {
     this.name = name;
+    this.service = service;
     service.registerServiceListener(this);
   }
 
@@ -59,11 +61,11 @@
       InterruptedException, TimeoutException {
     if (!finished.get()) {
       wait(timeout);
-    }
-    if (!finished.get()) {
-      throw new TimeoutException(name
-               + " did not finish after " + timeout +
-               " milliseconds");
+      if (!finished.get()) {
+        throw new TimeoutException(name
+                                   + " did not finish after " + timeout +
+                                   " milliseconds");
+      }
     }
   }