Merge pull request #314 from alonbl/JENKINS-38542

[JENKINS-38542] NPE when canceling a task when no job
jenkinsci · Jun 9, 2017 · e0ad9f1 · e0ad9f1
2 parents 35a03f0 + 1d32470
commit e0ad9f1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java b/...main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java
@@ -550,7 +550,11 @@ public static GerritTrigger getTrigger(@Nullable Job project) {
      */
     public void cancelTimer() {
         if (gerritTriggerTimerTask != null) {
-            logger.trace("GerritTrigger.cancelTimer(): {0}", job.getName());
+            String name = "N/A";
+            if (job != null) {
+                name = job.getName();
+            }
+            logger.trace("GerritTrigger.cancelTimer(): {}", name);
             gerritTriggerTimerTask.cancel();
             gerritTriggerTimerTask = null;
         }