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
This commit is contained in:
kohsuke committed 2007-09-21 14:40:45 +00:00
1 parent f9171fdee5
commit 66a63b2689
5 files changed
+5 -7

No files matched your search

@@ -383,6 +383,7 @@ public class MatrixProject extends AbstractProject<MatrixProject,MatrixBuild> 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();
}
@@ -129,7 +129,6 @@ public final class MavenModule extends AbstractMavenProject<MavenModule,MavenBui
reporters.setOwner(this);
if(dependencies==null)
dependencies = Collections.emptySet();
updateTransientActions();
}
/**
@@ -266,8 +266,6 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
if(reporters==null)
reporters = new DescribableList<MavenReporter, Descriptor<MavenReporter>>(this);
updateTransientActions();
}
private File getModulesDir() {
@@ -159,6 +159,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
if(transientActions==null)
transientActions = new Vector<Action>(); // happens when loaded from disk
updateTransientActions();
}
/**
@@ -747,6 +748,8 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
triggers = buildDescribable(req, Triggers.getApplicableTriggers(this), "trigger");
for (Trigger t : triggers)
t.start(this,true);
updateTransientActions();
}
protected final <T extends Describable<T>> List<T> buildDescribable(StaplerRequest req, List<? extends Descriptor<T>> descriptors, String prefix)
+1 -4
View File
@@ -54,8 +54,6 @@ public abstract class Project<P extends Project<P,B>,B extends Build<P,B>>
if(buildWrappers==null)
// it didn't exist in < 1.64
buildWrappers = new Vector<BuildWrapper>();
updateTransientActions();
}
public AbstractProject<?, ?> asProject() {
@@ -132,8 +130,7 @@ public abstract class Project<P extends Project<P,B>,B extends Build<P,B>>
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() {