Merge pull request #67 from KostyaSha/fixNPE

[JENKINS-29787] Fix NPE for race condition(?).
jenkinsci · Aug 10, 2015 · cc84ef4 · cc84ef4
2 parents a8dc555 + 18aca71
commit cc84ef4
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/main/java/com/cloudbees/jenkins/GitHubPushTrigger.java b/src/main/java/com/cloudbees/jenkins/GitHubPushTrigger.java
@@ -157,6 +157,10 @@ public void registerHooks() {
 
     @Override
     public void stop() {
+        if (job == null) {
+            return;
+        }
+
         if (getDescriptor().isManageHook()) {
             Cleaner cleaner = Cleaner.get();
             if (cleaner != null) {
@@ -167,6 +171,10 @@ public void stop() {
 
     @Override
     public Collection<? extends Action> getProjectActions() {
+        if (job == null) {
+            return Collections.emptyList();
+        }
+
         return Collections.singleton(new GitHubWebHookPollingAction());
     }