[FIXED JENKINS-24914] Don't block indefinitely every other month

jenkinsci · Oct 8, 2014 · adf8305 · adf8305
1 parent 07fd5fa
commit adf8305
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
@@ -2949,9 +2949,10 @@ public HttpRedirect doQuietDown(
             isQuietingDown = true;
         }
         if (block) {
-            if (timeout > 0) timeout += System.currentTimeMillis();
+            long waitUntil = timeout;
+            if (timeout > 0) waitUntil += System.currentTimeMillis();
             while (isQuietingDown
-                   && (timeout <= 0 || System.currentTimeMillis() < timeout)
+                   && (timeout <= 0 || System.currentTimeMillis() < waitUntil)
                    && !RestartListener.isAllReady()) {
                 Thread.sleep(1000);
             }