From ef15a02e70e023ad5351d52bcd5d18ec9626da83 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 25 Feb 2009 00:22:09 +0000 Subject: [PATCH] fixed a ConcurrentModificationException git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@15703 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/ExtensionList.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/hudson/ExtensionList.java b/core/src/main/java/hudson/ExtensionList.java index 0512876f68..06b412d0c6 100644 --- a/core/src/main/java/hudson/ExtensionList.java +++ b/core/src/main/java/hudson/ExtensionList.java @@ -26,6 +26,7 @@ package hudson; import hudson.model.Hudson; import hudson.util.DescriptorList; import hudson.util.Memoizer; +import hudson.util.Iterators; import hudson.ExtensionPoint.LegacyInstancesAreScopedToHudson; import java.util.AbstractList; @@ -102,7 +103,8 @@ public class ExtensionList extends AbstractList { } public Iterator iterator() { - return ensureLoaded().iterator(); + // we need to intercept mutation, so for now don't allow Iterator.remove + return Iterators.readOnly(ensureLoaded().iterator()); } public T get(int index) { @@ -114,14 +116,20 @@ public class ExtensionList extends AbstractList { } @Override - public synchronized T remove(int index) { - T t = get(index); - legacyInstances.remove(t); + public synchronized boolean remove(Object o) { + legacyInstances.remove(o); if(extensions!=null) { List r = new ArrayList(extensions); - r.remove(t); + r.remove(o); extensions = sort(r); } + return true; + } + + @Override + public synchronized T remove(int index) { + T t = get(index); + remove(t); return t; }