Skip to content
Permalink
Browse files
[FIXED JENKINS-11592] NPE in subversion polling of Maven jobs(cherry …
…picked from commit e2d7b39)

Conflicts:

	changelog.html
  • Loading branch information
kutzi authored and vjuranek committed Feb 1, 2012
1 parent 4d3538a commit 7f69189aab5103838949c5ef5e9e23cc4a3a8bd1
Showing 2 changed files with 30 additions and 7 deletions.
@@ -55,6 +55,26 @@
<!-- Record your changes in the trunk here. -->
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
<ul class=image>
<li class=bug>
Fixed NPE in Subversion polling of Maven jobs.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-11592">issue 11592</a>)
</ul>
</div><!--=TRUNK-END=-->

<!-- these changes are controlled by the release process. DO NOT MODIFY -->
<div id="rc" style="display:none;"><!--=BEGIN=-->
<h3><a name=v1.440>What's new in 1.440</a> <!--=DATE=--></h3>
<ul class=image>
<li class=bug>
Sorting "diff" in test result requires 2 clicks
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-5460">issue 5460</a>)
<li class=bug>
java.io.IOException: Unexpected termination of the channel - SEVERE: I/O error in channel Chunked connection when using jenkins-cli.jar (works on older Hudson version)
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-11130">issue 11130</a>)
<li class=bug>
Debian init script now returns the proper exit code from the 'status' command.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-11306">issue 11306</a>)
>>>>>>> e2d7b39... [FIXED JENKINS-11592] NPE in subversion polling of Maven jobs
<li class=bug>
Fixed a hash DoS vulnerability.
(<a href="http://www.ocert.org/advisories/ocert-2011-003.html">SECURITY-22</a>)
@@ -172,15 +172,18 @@ public EnvVars getEnvironment(TaskListener log) throws IOException, InterruptedE


mvn = mvn.forEnvironment(envs);
Node node = Computer.currentComputer().getNode();
if (node == null) {
log.getLogger().println("WARNING: cannot get current node: "+Computer.currentComputer());
return envs;

Computer computer = Computer.currentComputer();
if (computer != null) { // just in case were not in a build
Node node = computer.getNode();
if (node != null) {
mvn = mvn.forNode(node, log);

envs.put("M2_HOME", mvn.getHome());
envs.put("PATH+MAVEN", mvn.getHome() + "/bin");
}
}
mvn = mvn.forNode(node, log);

envs.put("M2_HOME", mvn.getHome());
envs.put("PATH+MAVEN", mvn.getHome() + "/bin");
return envs;
}

0 comments on commit 7f69189

Please sign in to comment.