From 31a54f38f6607dac6f02bcb6baea96addef6bb4c Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 27 Jan 2010 00:01:02 +0000 Subject: [PATCH] avoid double invocation of updateTransientActions by moving it to doConfigSubmit. Discussion at http://n4.nabble.com/Bug-getProjectAction-is-always-called-twice-tp1294814p1294814.html git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@26479 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/matrix/MatrixProject.java | 1 - core/src/main/java/hudson/model/AbstractProject.java | 4 ++-- core/src/main/java/hudson/model/Project.java | 1 - maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/hudson/matrix/MatrixProject.java b/core/src/main/java/hudson/matrix/MatrixProject.java index c59b87f52e..bf3dd3cf08 100644 --- a/core/src/main/java/hudson/matrix/MatrixProject.java +++ b/core/src/main/java/hudson/matrix/MatrixProject.java @@ -596,7 +596,6 @@ public class MatrixProject extends AbstractProject im buildWrappers.rebuild(req, json, BuildWrappers.getFor(this)); builders.rebuildHetero(req, json, Builder.all(), "builder"); publishers.rebuild(req, json, BuildStepDescriptor.filter(Publisher.all(),this.getClass())); - updateTransientActions(); // to pick up transient actions from builder, publisher, etc. rebuildConfigurations(); } diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 34cefb6145..acfebc8e44 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -524,6 +524,8 @@ public abstract class AbstractProject

,R extends A public void doConfigSubmit( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException, FormException { super.doConfigSubmit(req,rsp); + updateTransientActions(); + Set upstream = Collections.emptySet(); if(req.getParameter("pseudoUpstreamTrigger")!=null) { upstream = new HashSet(Items.fromNameList(req.getParameter("upstreamProjects"),AbstractProject.class)); @@ -1403,8 +1405,6 @@ public abstract class AbstractProject

,R extends A triggers = buildDescribable(req, Trigger.for_(this)); for (Trigger t : triggers) t.start(this,true); - - updateTransientActions(); } /** diff --git a/core/src/main/java/hudson/model/Project.java b/core/src/main/java/hudson/model/Project.java index 1017bcfdd6..c4ae0450cd 100644 --- a/core/src/main/java/hudson/model/Project.java +++ b/core/src/main/java/hudson/model/Project.java @@ -193,7 +193,6 @@ public abstract class Project

,B extends Build> buildWrappers.rebuild(req,json, BuildWrappers.getFor(this)); builders.rebuildHetero(req,json, Builder.all(), "builder"); publishers.rebuild(req, json, BuildStepDescriptor.filter(Publisher.all(), this.getClass())); - updateTransientActions(); // to pick up transient actions from builder, publisher, etc. } @Override diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java index 112b83e19e..e9c4e5449e 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java @@ -712,8 +712,6 @@ public final class MavenModuleSet extends AbstractMavenProject