Author: remm Date: Fri Feb 3 15:08:32 2017 New Revision: 1781569 URL: http://svn.apache.org/viewvc?rev=1781569&view=rev Log: 60683: Preload converters to avoid security failures on some JVMs.
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1781569&r1=1781568&r2=1781569&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java (original) +++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Fri Feb 3 15:08:32 2017 @@ -270,7 +270,9 @@ public final class SecurityClassLoad { throws Exception { final String basePackage = "org.apache.tomcat."; // buf + loader.loadClass(basePackage + "util.buf.B2CConverter"); loader.loadClass(basePackage + "util.buf.ByteBufferUtils"); + loader.loadClass(basePackage + "util.buf.C2BConverter"); loader.loadClass(basePackage + "util.buf.HexUtils"); loader.loadClass(basePackage + "util.buf.StringCache"); loader.loadClass(basePackage + "util.buf.StringCache$ByteEntry"); Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1781569&r1=1781568&r2=1781569&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Fri Feb 3 15:08:32 2017 @@ -66,6 +66,10 @@ implementation when multiple threads are managing objects and need to reference the annotation cache. (markt) </fix> + <fix> + <bug>60683</bug>: Security manager failure causing NPEs when doing IO + on some JVMs. (coty) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org