From c82672eb7fcfd81fe4131bdb376435b49271d696 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 28 Feb 2008 01:50:47 +0000 Subject: [PATCH] pick up transient project actions from BuildSteps. See http://www.nabble.com/Project-actions-and-matrix-build-%28%2BPublishers-and-MavenBuild%29-td15415391.html#a15415391 git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@7236 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/matrix/MatrixProject.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/core/src/main/java/hudson/matrix/MatrixProject.java b/core/src/main/java/hudson/matrix/MatrixProject.java index bc69d99886..a9f73570ff 100644 --- a/core/src/main/java/hudson/matrix/MatrixProject.java +++ b/core/src/main/java/hudson/matrix/MatrixProject.java @@ -3,6 +3,7 @@ package hudson.matrix; import hudson.CopyOnWrite; import hudson.FilePath; import hudson.XmlFile; +import hudson.triggers.Trigger; import hudson.model.AbstractProject; import hudson.model.DependencyGraph; import hudson.model.Descriptor; @@ -18,6 +19,7 @@ import hudson.model.Node; import hudson.model.SCMedItem; import hudson.model.TopLevelItem; import hudson.model.TopLevelItemDescriptor; +import hudson.model.Action; import hudson.tasks.BuildStep; import hudson.tasks.BuildWrapper; import hudson.tasks.BuildWrappers; @@ -94,6 +96,28 @@ public class MatrixProject extends AbstractProject im return axes; } + protected void updateTransientActions() { + synchronized(transientActions) { + super.updateTransientActions(); + + for (BuildStep step : builders) { + Action a = step.getProjectAction(this); + if(a!=null) + transientActions.add(a); + } + for (BuildStep step : publishers) { + Action a = step.getProjectAction(this); + if(a!=null) + transientActions.add(a); + } + for (Trigger trigger : triggers) { + Action a = trigger.getProjectAction(); + if(a!=null) + transientActions.add(a); + } + } + } + /** * Gets the subset of {@link AxisList} that are not system axes. */