Author: markt
Date: Mon Mar 19 20:46:15 2012
New Revision: 1302649
URL: http://svn.apache.org/viewvc?rev=1302649&view=rev
Log:
Make implementation of getParentClassLoader() consistent with the other
implementations across the code base.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1302649&r1=1302648&r2=1302649&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Mon Mar 19
20:46:15 2012
@@ -177,7 +177,10 @@ public class Catalina {
}
public ClassLoader getParentClassLoader() {
- return parentClassLoader;
+ if (parentClassLoader != null) {
+ return (parentClassLoader);
+ }
+ return ClassLoader.getSystemClassLoader();
}
public void setServer(Server server) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
