[FIXED JENKINS-41311] Fix NPE in CleanupJobsOnDelete.onDeleted

jenkinsci · Feb 24, 2017 · 7ecb946 · 7ecb946
1 parent 3ba2edb
commit 7ecb946
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/pipeline/milestone/MilestoneStepExecution.java b/src/main/java/org/jenkinsci/plugins/pipeline/milestone/MilestoneStepExecution.java
@@ -345,9 +345,12 @@ public static class CleanupJobsOnDelete extends ItemListener {
         public void onDeleted(Item item) {
             if (item instanceof Job) {
                 String jobName = item.getFullName();
-                Map<Integer, Milestone> job = getMilestonesByOrdinalByJob().get(jobName);
-                if (job != null) {
-                    remove(jobName);
+                Map<String, Map<Integer, Milestone>> milestones = getMilestonesByOrdinalByJob();
+                if (milestones != null) {
+                    Map<Integer, Milestone> job = getMilestonesByOrdinalByJob().get(jobName);
+                    if (job != null) {
+                        remove(jobName);
+                    }
                 }
             }
         }