From ff005a685ef94c648dd02298045f4f74fc747025 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 26 Feb 2009 22:24:43 +0000 Subject: [PATCH] Fixed a regression in 1.286 about handling form field validations in some plugins. (report) git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@15826 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/DescriptorExtensionList.java | 20 ++++++++++++++++++- core/src/main/java/hudson/model/Hudson.java | 4 +++- .../src/main/java/hudson/tasks/BuildStep.java | 5 +++++ .../main/java/hudson/util/DescriptorList.java | 5 +++++ core/src/main/java/hudson/util/Memoizer.java | 7 +++++++ .../test/java/hudson/model/HudsonTest.java | 19 ++++++++++++++++++ 6 files changed, 58 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/DescriptorExtensionList.java b/core/src/main/java/hudson/DescriptorExtensionList.java index 0856c686df..3a570dc023 100644 --- a/core/src/main/java/hudson/DescriptorExtensionList.java +++ b/core/src/main/java/hudson/DescriptorExtensionList.java @@ -29,12 +29,15 @@ import hudson.model.Hudson; import hudson.model.ViewDescriptor; import hudson.model.Descriptor.FormException; import hudson.util.Memoizer; +import hudson.util.Iterators; +import hudson.util.Iterators.FlattenIterator; import hudson.slaves.NodeDescriptor; import hudson.tasks.Publisher; import hudson.tasks.Publisher.DescriptorExtensionListImpl; import java.util.List; import java.util.ArrayList; +import java.util.Iterator; import java.util.logging.Logger; import java.util.concurrent.CopyOnWriteArrayList; import java.lang.reflect.Type; @@ -138,7 +141,7 @@ public class DescriptorExtensionList, D extends Descrip } /** - * Stores manually registered Descriptor instances. + * Stores manually registered Descriptor instances. Keyed by the {@link Describable} type. */ private static final Memoizer legacyDescriptors = new Memoizer() { public CopyOnWriteArrayList compute(Class key) { @@ -146,5 +149,20 @@ public class DescriptorExtensionList, D extends Descrip } }; + /** + * List up all the legacy instances currently in use. + */ + public static Iterable listLegacyInstances() { + return new Iterable() { + public Iterator iterator() { + return new FlattenIterator(legacyDescriptors.values()) { + protected Iterator expand(CopyOnWriteArrayList v) { + return v.iterator(); + } + }; + } + }; + } + private static final Logger LOGGER = Logger.getLogger(DescriptorExtensionList.class.getName()); } diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index 6ba59691b5..adcb5b6b04 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -103,6 +103,7 @@ import hudson.util.HudsonIsRestarting; import hudson.util.DescribableList; import hudson.util.Futures; import hudson.util.Memoizer; +import hudson.util.Iterators; import hudson.widgets.Widget; import net.sf.json.JSONObject; import org.acegisecurity.*; @@ -691,7 +692,8 @@ public final class Hudson extends Node implements ItemGroup, Stapl * this just doesn't scale. */ public Descriptor getDescriptor(String fullyQualifiedClassName) { - for( Descriptor d : getExtensionList(Descriptor.class) ) + // legacy descriptors that are reigstered manually doesn't show up in getExtensionList, so check them explicitly. + for( Descriptor d : Iterators.sequence(getExtensionList(Descriptor.class),DescriptorExtensionList.listLegacyInstances()) ) if(d.clazz.getName().equals(fullyQualifiedClassName)) return d; return null; diff --git a/core/src/main/java/hudson/tasks/BuildStep.java b/core/src/main/java/hudson/tasks/BuildStep.java index 3fdb7b62c2..c893759df2 100644 --- a/core/src/main/java/hudson/tasks/BuildStep.java +++ b/core/src/main/java/hudson/tasks/BuildStep.java @@ -219,5 +219,10 @@ public interface BuildStep { public Iterator> iterator() { return core.iterator(); } + + @Override + public boolean remove(Object o) { + return core.remove(o); + } } } diff --git a/core/src/main/java/hudson/util/DescriptorList.java b/core/src/main/java/hudson/util/DescriptorList.java index a04ba4dccc..e0a94d1970 100644 --- a/core/src/main/java/hudson/util/DescriptorList.java +++ b/core/src/main/java/hudson/util/DescriptorList.java @@ -130,6 +130,11 @@ public final class DescriptorList> extends AbstractList add(element); // order is ignored } + @Override + public boolean remove(Object o) { + return store().remove(o); + } + /** * Gets the actual data store. This is the key to control the dual-mode nature of {@link DescriptorList} */ diff --git a/core/src/main/java/hudson/util/Memoizer.java b/core/src/main/java/hudson/util/Memoizer.java index 3cb063ab7d..d150040906 100644 --- a/core/src/main/java/hudson/util/Memoizer.java +++ b/core/src/main/java/hudson/util/Memoizer.java @@ -65,4 +65,11 @@ public abstract class Memoizer { public void clear() { store.clear(); } + + /** + * Provides a snapshot view of all {@code V}s. + */ + public Iterable values() { + return store.values(); + } } diff --git a/test/src/test/java/hudson/model/HudsonTest.java b/test/src/test/java/hudson/model/HudsonTest.java index 26ce1a6b91..98d9d1e359 100644 --- a/test/src/test/java/hudson/model/HudsonTest.java +++ b/test/src/test/java/hudson/model/HudsonTest.java @@ -36,6 +36,7 @@ import hudson.search.SearchTest; import hudson.security.AuthorizationStrategy; import hudson.security.SecurityRealm; import hudson.tasks.Ant; +import hudson.tasks.BuildStep; import hudson.tasks.Ant.AntInstallation; import hudson.tasks.Ant.DescriptorImpl; import org.jvnet.hudson.test.Email; @@ -145,4 +146,22 @@ public class HudsonTest extends HudsonTestCase { // the master computer object should be still here wc.goTo("computer/(master)/"); } + + /** + * Legacy descriptors should be visible in the /descriptor/xyz URL. + */ + @Email("http://www.nabble.com/1.286-version-and-description-The-requested-resource-%28%29-is-not--available.-td22233801.html") + public void testLegacyDescriptorLookup() throws Exception { + Descriptor dummy = new Descriptor(HudsonTest.class) { + public String getDisplayName() { + return "dummy"; + } + }; + + BuildStep.PUBLISHERS.addRecorder(dummy); + assertSame(dummy,hudson.getDescriptor(HudsonTest.class.getName())); + + BuildStep.PUBLISHERS.remove(dummy); + assertNull(hudson.getDescriptor(HudsonTest.class.getName())); + } }