Skip to content
Permalink
Browse files
[FIXED JENKINS-21999] If a slave node does not exist it will throw a
null pointer exception. Instead we create a dummy launcher and return
that if it is unable to get the slave node.

(cherry picked from commit d2a2ec5)
  • Loading branch information
christ66 authored and olivergondza committed May 13, 2014
1 parent b7abcbd commit 7946d9fa3e00295298294137a3b263d2c6def9ff
Showing with 38 additions and 1 deletion.
  1. +25 −0 core/src/main/java/hudson/Launcher.java
  2. +13 −1 core/src/main/java/hudson/model/Slave.java
@@ -841,6 +841,31 @@ public synchronized void close() throws IOException {
}
}

public static class DummyLauncher extends Launcher {

public DummyLauncher(TaskListener listener) {
super(listener, null);
}

@Override
public Proc launch(ProcStarter starter) throws IOException {
listener.error("Can not call launch on a dummy launcher.");
return null;
}

@Override
public Channel launchChannel(String[] cmd, OutputStream out, FilePath workDir, Map<String, String> envVars) throws IOException, InterruptedException {
listener.error("Can not call launchChannel on a dummy launcher.");
return null;
}

@Override
public void kill(Map<String, String> modelEnvVars) throws IOException, InterruptedException {
// Kill method should do nothing.
}
}


/**
* Launches processes remotely by using the given channel.
*/
@@ -343,9 +343,21 @@ public byte[] readFully() throws IOException {

}

/**
* Creates a launcher for the slave.
*
* @return
* If there is no computer it will return a {@link hudson.Launcher.DummyLauncher}, otherwise it
* will return a {@link hudson.Launcher.RemoteLauncher} instead.
*/
public Launcher createLauncher(TaskListener listener) {
SlaveComputer c = getComputer();
return new RemoteLauncher(listener, c.getChannel(), c.isUnix()).decorateFor(this);
if (c == null) {
listener.error("Issue with creating launcher for slave " + name + ".");
return new Launcher.DummyLauncher(listener);
} else {
return new RemoteLauncher(listener, c.getChannel(), c.isUnix()).decorateFor(this);
}
}

/**

0 comments on commit 7946d9f

Please sign in to comment.