Merge pull request #1 from avdv/fix-npe-jenkins-27418

Avoid NPE in ScoverageProjectAction.doDynamic
jenkinsci · Mar 17, 2015 · 94eedc0 · 94eedc0
2 parents b3c814b + 42eb91c
commit 94eedc0
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/scoverage/ScoverageProjectAction.java b/src/main/java/org/jenkinsci/plugins/scoverage/ScoverageProjectAction.java
@@ -57,11 +57,14 @@ public TrendGraph getTrendGraph() {
 
     public DirectoryBrowserSupport doDynamic(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, InterruptedException {
         if (project.getLastBuild() != null && getDisplayName() != null) {
-            String url = getLastSuccessfulBuildAction().getUrlName();
-            FilePath path = new FilePath(project.getLastBuild().getRootDir()).child(url);
-            return new DirectoryBrowserSupport(this, path, "Scoverage HTML Report", "", false);
-        } else {
-            return null;
+	    ScoverageBuildAction lastSuccessfulAction = getLastSuccessfulBuildAction();
+	    if (lastSuccessfulAction != null) {
+		String url = lastSuccessfulAction.getUrlName();
+		FilePath path = new FilePath(project.getLastBuild().getRootDir()).child(url);
+
+		return new DirectoryBrowserSupport(this, path, "Scoverage HTML Report", "", false);
+	    }
         }
+	return null;
     }
 }