On 15/10/2013 22:04, Konstantin Kolinko wrote: >> Modified: >> tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java >> URL: >> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1532508&r1=1532507&r2=1532508&view=diff >> ============================================================================== >> --- >> tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java >> (original) >> +++ >> tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java >> Tue Oct 15 20:05:48 2013 >> @@ -43,6 +43,7 @@ import java.security.PrivilegedAction; >> import java.security.ProtectionDomain; >> import java.util.ArrayList; >> import java.util.Collection; >> +import java.util.Collections; >> import java.util.ConcurrentModificationException; >> import java.util.Enumeration; >> import java.util.HashMap; >> @@ -1355,20 +1356,7 @@ public class WebappClassLoader >> >> } >> >> - final Iterator<URL> iterator = result.iterator(); >> - >> - return new Enumeration<URL>() { >> - @Override >> - public boolean hasMoreElements() { >> - return iterator.hasNext(); >> - } >> - >> - @Override >> - public URL nextElement() { >> - return iterator.next(); >> - } >> - }; >> - >> + return Collections.enumeration(result); >> } > > > A nice simplification. > Why are these changes in 7.0.x only, but I do not see them in Tomcat trunk? > (Maybe you have them, but forgot to commit).
Creating the Enumeration was failing under a security manager in 7.0.x but not in trunk. I assumed that the change has already been made in trunk. Obviously not. I'll do that shortly. Mark --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
