Merge pull request #239 from oleg-nenashev/findbugs-cleanup/JENKINS-3…

…7566-uncond-wait-ch-property [JENKINS-37566] - FindBugs: Prevent the unconditional wait warning in Channel#waitForProperty()
jenkinsci · Nov 30, 2017 · bbf5408 · bbf5408
2 parents 99fec6a + b50a781
commit bbf5408
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/main/java/hudson/remoting/Channel.java b/src/main/java/hudson/remoting/Channel.java
@@ -1463,17 +1463,18 @@ public Object waitForProperty(@Nonnull Object key) throws InterruptedException {
             throw new IllegalStateException("Channel was already closed", outClosed);
 
         while (true) {
+            // Now we wait till setProperty() notifies us (in a cycle)
             synchronized(this) {
-                // Now we wait till setProperty() notifies us (in a cycle)
-                wait(1000);
+                if (isInClosed()) {
+                    throw new IllegalStateException("Channel was already closed", inClosed);
+                } else if (isOutClosed()) {
+                    throw new IllegalStateException("Channel was already closed", outClosed);
+                } else {
+                    wait(1000);
+                }
             }
             Object v = properties.get(key);
             if (v != null) return v;
-
-            if (isInClosed())
-                throw new IllegalStateException("Channel was already closed", inClosed);
-            if (isOutClosed())
-                throw new IllegalStateException("Channel was already closed", outClosed);
         }
     }