Author: markt
Date: Tue Jun  9 20:50:31 2015
New Revision: 1684527

URL: http://svn.apache.org/r1684527
Log:
Add javax.websocket.* to the classes for which the web application class loader 
will always delegate first (so the classes provided by Tomcat cannot be 
overridden).

Modified:
    tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java

Modified: 
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1684527&r1=1684526&r2=1684527&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Tue 
Jun  9 20:50:31 2015
@@ -192,6 +192,7 @@ public abstract class WebappClassLoaderB
     protected final Matcher packageTriggersDeny = Pattern.compile(
             "^javax\\.el\\.|" +
             "^javax\\.servlet\\.|" +
+            "^javax\\.websocket\\.|" +
             "^org\\.apache\\.(catalina|coyote|el|jasper|juli|naming|tomcat)\\."
             ).matcher("");
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to