Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-03 03:25:28 -04:00
Code Issues Projects Releases Wiki Activity

Call #deregisterServiceProvider() outside of the iteration over the existing service providers

Browse Source
This commit is contained in:
Andreas Kohn 2013-12-30 17:57:38 +01:00
parent 63d9029a3e
commit ecc08daa2d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
servlet/src/main/java/com/twelvemonkeys/servlet/image/IIOProviderContextListener.java
View File

@ -28,12 +28,15 @@
package com.twelvemonkeys.servlet.image; package com.twelvemonkeys.servlet.image;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.imageio.spi.IIORegistry; import javax.imageio.spi.IIORegistry;
import javax.imageio.spi.ServiceRegistry; import javax.imageio.spi.ServiceRegistry;
import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener; import javax.servlet.ServletContextListener;
import java.util.Iterator;
/** /**
* Takes care of registering and de-registering local ImageIO plugins (service providers) for the servlet context. * Takes care of registering and de-registering local ImageIO plugins (service providers) for the servlet context.
@ -66,8 +69,13 @@ public final class IIOProviderContextListener implements ServletContextListener
Class<?> category = categories.next(); Class<?> category = categories.next();
Iterator<?> providers = registry.getServiceProviders(category, localFilter, false); Iterator<?> providers = registry.getServiceProviders(category, localFilter, false);
// Copy the providers, deregistering while iterating over providers can lead to ConcurrentModificationExceptions.
List<Object> providerObjects = new ArrayList<Object>();
while (providers.hasNext()) { while (providers.hasNext()) {
Object provider = providers.next(); providerObjects.add(providers.next());
}
for (Object provider : providerObjects) {
registry.deregisterServiceProvider(provider); registry.deregisterServiceProvider(provider);
event.getServletContext().log(String.format("Unregistered locally installed provider class: %s", provider.getClass())); event.getServletContext().log(String.format("Unregistered locally installed provider class: %s", provider.getClass()));
} }