[JENKINS-38542] NPE when canceling a task when no job

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
jenkinsci · May 24, 2017 · 1d32470 · 1d32470
1 parent 35a03f0
commit 1d32470
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;
         }