From 66a63b2689172687ae2d3e7853bdfd93aa6ef212 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 21 Sep 2007 14:40:45 +0000 Subject: [PATCH] fixed a bug where actions from job properties are not reflected to MatrixProject. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@4878 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/matrix/MatrixProject.java | 1 + core/src/main/java/hudson/maven/MavenModule.java | 1 - core/src/main/java/hudson/maven/MavenModuleSet.java | 2 -- core/src/main/java/hudson/model/AbstractProject.java | 3 +++ core/src/main/java/hudson/model/Project.java | 5 +---- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/hudson/matrix/MatrixProject.java b/core/src/main/java/hudson/matrix/MatrixProject.java index edef375b19..14a7c02e8f 100644 --- a/core/src/main/java/hudson/matrix/MatrixProject.java +++ b/core/src/main/java/hudson/matrix/MatrixProject.java @@ -383,6 +383,7 @@ public class MatrixProject extends AbstractProject im buildWrappers = buildDescribable(req, BuildWrappers.WRAPPERS, "wrapper"); builders = buildDescribable(req, BuildStep.BUILDERS, "builder"); publishers = buildDescribable(req, BuildStep.PUBLISHERS, "publisher"); + updateTransientActions(); // to pick up transient actions from builder, publisher, etc. rebuildConfigurations(); } diff --git a/core/src/main/java/hudson/maven/MavenModule.java b/core/src/main/java/hudson/maven/MavenModule.java index 8d024e204e..14f9f6372a 100644 --- a/core/src/main/java/hudson/maven/MavenModule.java +++ b/core/src/main/java/hudson/maven/MavenModule.java @@ -129,7 +129,6 @@ public final class MavenModule extends AbstractMavenProject>(this); - - updateTransientActions(); } private File getModulesDir() { diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 47d48d0761..290b6d92d9 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -159,6 +159,7 @@ public abstract class AbstractProject

,R extends A if(transientActions==null) transientActions = new Vector(); // happens when loaded from disk + updateTransientActions(); } /** @@ -747,6 +748,8 @@ public abstract class AbstractProject

,R extends A triggers = buildDescribable(req, Triggers.getApplicableTriggers(this), "trigger"); for (Trigger t : triggers) t.start(this,true); + + updateTransientActions(); } protected final > List buildDescribable(StaplerRequest req, List> descriptors, String prefix) diff --git a/core/src/main/java/hudson/model/Project.java b/core/src/main/java/hudson/model/Project.java index 488feac79a..19fecb26ae 100644 --- a/core/src/main/java/hudson/model/Project.java +++ b/core/src/main/java/hudson/model/Project.java @@ -54,8 +54,6 @@ public abstract class Project

,B extends Build> if(buildWrappers==null) // it didn't exist in < 1.64 buildWrappers = new Vector(); - - updateTransientActions(); } public AbstractProject asProject() { @@ -132,8 +130,7 @@ public abstract class Project

,B extends Build> buildWrappers = buildDescribable(req, BuildWrappers.WRAPPERS, "wrapper"); builders = buildDescribable(req, BuildStep.BUILDERS, "builder"); publishers = buildDescribable(req, BuildStep.PUBLISHERS, "publisher"); - - updateTransientActions(); + updateTransientActions(); // to pick up transient actions from builder, publisher, etc. } protected void updateTransientActions() {