Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-11078] prevent NPE
  • Loading branch information
ndeloof committed Sep 18, 2014
1 parent 0f96445 commit 6e44d07
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/main/java/hudson/maven/Maven3Builder.java
Expand Up @@ -24,6 +24,8 @@
package hudson.maven;

import static hudson.Util.fixNull;

import edu.umd.cs.findbugs.annotations.CheckForNull;
import hudson.maven.MavenBuild.ProxyImpl2;
import hudson.maven.reporters.TestFailureDetector;
import hudson.maven.util.ExecutionEventLogger;
Expand Down Expand Up @@ -390,7 +392,7 @@ public boolean hasTestFailures(){
return hasTestFailures.get();
}

private MavenBuildProxy2 getMavenBuildProxy2(MavenProject mavenProject) {
private @CheckForNull MavenBuildProxy2 getMavenBuildProxy2(MavenProject mavenProject) {
for (Entry<ModuleName,FilterImpl> entry : proxies.entrySet()) {
if (entry.getKey().compareTo( new ModuleName( mavenProject ) ) == 0) {
return entry.getValue();
Expand Down Expand Up @@ -513,8 +515,9 @@ private void recordProjectStarted(ExecutionEvent event) {
List<MavenReporter> mavenReporters = getMavenReporters( mavenProject );

MavenBuildProxy2 mavenBuildProxy2 = getMavenBuildProxy2( mavenProject );
mavenBuildProxy2.start();
if (mavenBuildProxy2 == null) return;

mavenBuildProxy2.start();

for (MavenReporter mavenReporter : fixNull(mavenReporters)) {
try {
Expand Down Expand Up @@ -547,6 +550,7 @@ public void projectFailed( ExecutionEvent event ) {

private void recordProjectEnded(ExecutionEvent event, Result result) {
MavenBuildProxy2 mavenBuildProxy2 = getMavenBuildProxy2( event.getProject() );
if (mavenBuildProxy2 == null) return;
mavenBuildProxy2.setResult(result);

List<MavenReporter> mavenReporters = getMavenReporters( event.getProject() );
Expand Down Expand Up @@ -590,6 +594,7 @@ private void recordMojoStarted(ExecutionEvent event) {
List<MavenReporter> mavenReporters = getMavenReporters( mavenProject );

MavenBuildProxy2 mavenBuildProxy2 = getMavenBuildProxy2( mavenProject );
if (mavenBuildProxy2 == null) return;

for (MavenReporter mavenReporter : fixNull(mavenReporters)) {
try {
Expand Down Expand Up @@ -620,6 +625,7 @@ private void recordMojoEnded(ExecutionEvent event, Exception problem) {
List<MavenReporter> mavenReporters = getMavenReporters( mavenProject );

MavenBuildProxy2 mavenBuildProxy2 = getMavenBuildProxy2( mavenProject );
if (mavenBuildProxy2 == null) return;

mavenBuildProxy2.setExecutedMojos( this.executedMojosPerModule.get( new ModuleName(event) ) );

Expand Down

0 comments on commit 6e44d07

Please sign in to comment.