Merge pull request #21 from christ66/ZD-21057

Fixed NPE when onEnterBlocked() is called during startup. A NPE can happen if the throttle concurrent plugin is enabled and the queue is blocked. Relates to [JENKINS-24911]
jenkinsci · Oct 20, 2014 · 9dd2052 · 9dd2052
2 parents 41e2edc + 72272f4
commit 9dd2052
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/jenkins/advancedqueue/sorter/AdvancedQueueSorterQueueListener.java b/src/main/java/jenkins/advancedqueue/sorter/AdvancedQueueSorterQueueListener.java
@@ -58,7 +58,11 @@ public void onEnterBuildable(BuildableItem bi) {
 
 	@Override
 	public void onEnterBlocked(BlockedItem bi) {
-		QueueItemCache.get().getItem(bi.id).setBlocked();
+    ItemInfo item = QueueItemCache.get().getItem(bi.id);
+    // Null at startup
+    if (item != null) {
+      item.setBlocked();
+    }
 	}
 
 }