Author: markt Date: Tue Mar 27 18:28:35 2012 New Revision: 1305943 URL: http://svn.apache.org/viewvc?rev=1305943&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52833 Fix NPE in some embedded / osgi scenarios where the class loader my not have the system class loader as a parent.
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Modified: tomcat/trunk/java/org/apache/catalina/core/StandardServer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardServer.java?rev=1305943&r1=1305942&r2=1305943&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Tue Mar 27 18:28:35 2012 @@ -796,11 +796,10 @@ public final class StandardServer extend // Populate the extension validator with JARs from common and shared // class loaders if (getCatalina() != null) { - ClassLoader cl = - getCatalina().getParentClassLoader(); + ClassLoader cl = getCatalina().getParentClassLoader(); // Walk the class loader hierarchy. Stop at the system class loader. // This will add the shared (if present) and common class loaders - while (cl != ClassLoader.getSystemClassLoader()) { + while (cl != null && cl != ClassLoader.getSystemClassLoader()) { if (cl instanceof URLClassLoader) { URL[] urls = ((URLClassLoader) cl).getURLs(); for (URL url : urls) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org