NPE error and cleanup.

Remove a null pointer error, fixes #jenkinsci#117 Cleanup some of the logging in the main trigger, fixes jenkinsci#118
nosmo · Jun 20, 2015 · 2276c4f · 2276c4f
1 parent 85d40bb
commit 2276c4f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/ghprb/GhprbRepository.java b/src/main/java/org/jenkinsci/plugins/ghprb/GhprbRepository.java
@@ -6,7 +6,6 @@
 import hudson.model.TaskListener;
 import jenkins.model.Jenkins;
 
-import org.apache.commons.codec.binary.Hex;
 import org.jenkinsci.plugins.ghprb.extensions.GhprbCommentAppender;
 import org.jenkinsci.plugins.ghprb.extensions.GhprbCommitStatusException;
 import org.jenkinsci.plugins.ghprb.extensions.GhprbExtension;
@@ -15,9 +14,6 @@
 import org.kohsuke.github.GHEventPayload.IssueComment;
 import org.kohsuke.github.GHEventPayload.PullRequest;
 
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintStream;

diff --git a/src/main/java/org/jenkinsci/plugins/ghprb/GhprbTrigger.java b/src/main/java/org/jenkinsci/plugins/ghprb/GhprbTrigger.java
@@ -67,6 +67,7 @@ public class GhprbTrigger extends GhprbTriggerBackwardsCompatible {
     private List<GhprbBranch> whiteListTargetBranches;
     private transient Ghprb helper;
     private String project;
+    private AbstractProject<?, ?> _project;
     private GhprbGitHubAuth gitHubApiAuth;
 
 
@@ -146,6 +147,7 @@ public static DescriptorImpl getDscp() {
     public void start(AbstractProject<?, ?> project, boolean newInstance) {
         // We should always start the trigger, and handle cases where we don't run in the run function.
         super.start(project, newInstance);
+        this._project = project;
         this.project = project.getFullName();
 
         if (project.isDisabled()) {
@@ -190,15 +192,16 @@ public void run() {
             return;
         }
 
-        if (helper == null) {
-            logger.log(Level.SEVERE, "Helper is null, unable to run trigger");
+        if ((helper != null && helper.isProjectDisabled()) || (_project != null && _project.isDisabled())) {
+            logger.log(Level.FINE, "Project is disabled, ignoring trigger run call");
             return;
         }
-
-        if (helper.isProjectDisabled()) {
-            logger.log(Level.FINE, "Project is disabled, ignoring trigger run call");
+        
+        if (helper == null) {
+            logger.log(Level.SEVERE, "Helper is null and Project is not disabled, unable to run trigger");
             return;
         }
+
 
         logger.log(Level.FINE, "Running trigger for {0}", project);
 

diff --git a/src/main/java/org/jenkinsci/plugins/ghprb/extensions/status/GhprbSimpleStatus.java b/src/main/java/org/jenkinsci/plugins/ghprb/extensions/status/GhprbSimpleStatus.java
@@ -131,11 +131,11 @@ public void onBuildComplete(AbstractBuild<?, ?> build, TaskListener listener, GH
         StringBuilder sb = new StringBuilder();
 
         if (completedStatus == null || completedStatus.isEmpty()) {
+            sb.append("Build finished.");
+        } else {
             for (GhprbBuildResultMessage buildStatus : completedStatus) {
                 sb.append(buildStatus.postBuildComment(build, listener));
             }
-        } else {
-            sb.append("Build finished.");
         }
 
         sb.append(" ");