diff --git a/core/src/main/java/hudson/tasks/BuildWrappers.java b/core/src/main/java/hudson/tasks/BuildWrappers.java index 6f329c55f2..cfb405df88 100644 --- a/core/src/main/java/hudson/tasks/BuildWrappers.java +++ b/core/src/main/java/hudson/tasks/BuildWrappers.java @@ -25,6 +25,8 @@ package hudson.tasks; import hudson.model.AbstractProject; import hudson.model.Descriptor; +import hudson.model.Hudson; +import hudson.model.AbstractProject.AbstractProjectDescriptor; import hudson.Extension; import hudson.util.DescriptorList; import hudson.maven.MavenReporter; @@ -54,7 +56,11 @@ public class BuildWrappers { */ public static List> getFor(AbstractProject project) { List> result = new ArrayList>(); + Descriptor pd = Hudson.getInstance().getDescriptor((Class)project.getClass()); + for (Descriptor w : BuildWrapper.all()) { + if (pd instanceof AbstractProjectDescriptor && !((AbstractProjectDescriptor)pd).isApplicable(w)) + continue; if (w instanceof BuildWrapperDescriptor) { BuildWrapperDescriptor bwd = (BuildWrapperDescriptor) w; if(bwd.isApplicable(project))