Merge pull request #1919 from stephenc/jenkins-31649

[FIXED JENKINS-31649] Check should be against AccessControlled not Item
jenkinsci · Nov 20, 2015 · 46ef3a5 · 46ef3a5
2 parents 2327618 + cf1fdf9
commit 46ef3a5
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
@@ -799,8 +799,9 @@ public Item[] getItems() {
     }
 
     private List<Item> filterItemListBasedOnPermissions(List<Item> r, Item t) {
-        if (t.task instanceof hudson.model.Item) {
-            if (((hudson.model.Item)t.task).hasPermission(hudson.model.Item.READ)) {
+        if (t.task instanceof hudson.security.AccessControlled) {
+            if (((hudson.security.AccessControlled)t.task).hasPermission(hudson.model.Item.READ)
+                    || ((hudson.security.AccessControlled) t.task).hasPermission(hudson.security.Permission.READ)) {
                 r.add(t);
             }
         }