diff --git a/core/src/main/java/hudson/model/CauseAction.java b/core/src/main/java/hudson/model/CauseAction.java index 1938f6f561ec0d40f862d7f945d2b1da5e88304d..e0593790e8f62493ad0470bd1bc308dbda55b647 100644 --- a/core/src/main/java/hudson/model/CauseAction.java +++ b/core/src/main/java/hudson/model/CauseAction.java @@ -101,8 +101,10 @@ public class CauseAction implements FoldableAction, RunAction2 { public Map getCauseCounts() { Map result = new LinkedHashMap(); for (Cause c : causes) { - Integer i = result.get(c); - result.put(c, i == null ? 1 : i.intValue() + 1); + if (c != null) { + Integer i = result.get(c); + result.put(c, i == null ? 1 : i.intValue() + 1); + } } return result; } @@ -120,7 +122,8 @@ public class CauseAction implements FoldableAction, RunAction2 { if (owner instanceof AbstractBuild) { // cf. onAttached AbstractBuild b = (AbstractBuild) owner; for (Cause c : causes) { - c.onLoad(b); + if (c != null) + c.onLoad(b); } } } @@ -132,7 +135,8 @@ public class CauseAction implements FoldableAction, RunAction2 { if (owner instanceof AbstractBuild) {// this should be always true but being defensive here AbstractBuild b = (AbstractBuild) owner; for (Cause c : causes) { - c.onAddedTo(b); + if (c != null) + c.onAddedTo(b); } } }