Merge pull request #2290 from pjanouse/JENKINS-34448

[JENKINS-34448] Fixed offlineCause race condition
jenkinsci · Apr 28, 2016 · b8f983b · b8f983b
2 parents 67597a7 + 822cec6
commit b8f983b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java
@@ -249,7 +249,7 @@ public Object call() throws Exception {
                     try {
                         for (ComputerListener cl : ComputerListener.all())
                             cl.preLaunch(SlaveComputer.this, taskListener);
-
+                        offlineCause = null;
                         launcher.launch(SlaveComputer.this, taskListener);
                     } catch (AbortException e) {
                         taskListener.error(e.getMessage());
@@ -266,7 +266,7 @@ public Object call() throws Exception {
                         throw e;
                     }
                 } finally {
-                    if (channel==null) {
+                    if (channel==null && offlineCause == null) {
                         offlineCause = new OfflineCause.LaunchFailed();
                         for (ComputerListener cl : ComputerListener.all())
                             cl.onLaunchFailure(SlaveComputer.this, taskListener);