Merge pull request hudson#322 from 8nevil8/master

SetCascadingProjectName method should be called from Job class during submit
antkozak · Nov 24, 2011 · 3347a98 · 3347a98
2 parents 73259a9 + 6d03dc7
commit 3347a98
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/hudson-core/src/main/java/hudson/model/AbstractProject.java b/hudson-core/src/main/java/hudson/model/AbstractProject.java
@@ -99,7 +99,6 @@
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
 import net.sf.json.JSONObject;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.hudsonci.api.model.IAbstractProject;
 import org.hudsonci.model.project.property.IntegerProjectProperty;
@@ -1954,7 +1953,6 @@ protected void submit(StaplerRequest req, StaplerResponse rsp) throws IOExceptio
         super.submit(req,rsp);
 
         makeDisabled(null != req.getParameter("disable"));
-        setCascadingProjectName(StringUtils.trimToNull(req.getParameter("cascadingProjectName")));
         setJDK(req.getParameter("jdk"));
         setQuietPeriod(null != req.getParameter(HAS_QUIET_PERIOD_PROPERTY_NAME)
             ? req.getParameter("quiet_period") : null);

diff --git a/hudson-core/src/main/java/hudson/model/Job.java b/hudson-core/src/main/java/hudson/model/Job.java
@@ -1454,6 +1454,7 @@ protected void submit(StaplerRequest req, StaplerResponse rsp) throws IOExceptio
         description = req.getParameter("description");
         keepDependencies = req.getParameter("keepDependencies") != null;
         properties.clear();
+        setCascadingProjectName(StringUtils.trimToNull(req.getParameter("cascadingProjectName")));
         CopyOnWriteList parameterDefinitionProperties = new CopyOnWriteList();
         int i = 0;
         for (JobPropertyDescriptor d : JobPropertyDescriptor.getPropertyDescriptors(Job.this.getClass())) {