2013/10/16 <ma...@apache.org>: > Author: markt > Date: Tue Oct 15 20:05:48 2013 > New Revision: 1532508 > > URL: http://svn.apache.org/r1532508 > Log: > Fix WebSocket when running under a security manager > > Modified: > tomcat/tc7.0.x/trunk/ (props changed) > tomcat/tc7.0.x/trunk/conf/catalina.policy > > tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java > > Propchange: tomcat/tc7.0.x/trunk/ > ------------------------------------------------------------------------------ > Merged /tomcat/trunk:r1532506 > > Modified: tomcat/tc7.0.x/trunk/conf/catalina.policy > URL: > http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/conf/catalina.policy?rev=1532508&r1=1532507&r2=1532508&view=diff > ============================================================================== > --- tomcat/tc7.0.x/trunk/conf/catalina.policy (original) > +++ tomcat/tc7.0.x/trunk/conf/catalina.policy Tue Oct 15 20:05:48 2013 > @@ -186,8 +186,12 @@ grant { > // Applications using Comet need to be able to access this package > permission java.lang.RuntimePermission > "accessClassInPackage.org.apache.catalina.comet"; > > - // Applications using WebSocket need to be able to access this package > + // Applications using the legacy WebSocket implementation need to be > able to access this package > permission java.lang.RuntimePermission > "accessClassInPackage.org.apache.catalina.websocket"; > + > + // Applications using the JSR-356 WebSocket implementation need to be > able to access these packages > + permission java.lang.RuntimePermission > "accessClassInPackage.org.apache.tomcat.websocket"; > + permission java.lang.RuntimePermission > "accessClassInPackage.org.apache.tomcat.websocket.server"; > }; > > > > 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). Best regards, Konstantin Kolinko --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
