Author: markt
Date: Mon Mar 19 20:48:49 2012
New Revision: 1302650
URL: http://svn.apache.org/viewvc?rev=1302650&view=rev
Log:
Make implementation of getParentClassLoader() consistent with the other
implementations across the code base.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1302649
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1302650&r1=1302649&r2=1302650&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java Mon Mar
19 20:48:49 2012
@@ -180,7 +180,10 @@ public class Catalina {
}
public ClassLoader getParentClassLoader() {
- return parentClassLoader;
+ if (parentClassLoader != null) {
+ return (parentClassLoader);
+ }
+ return ClassLoader.getSystemClassLoader();
}
public void setServer(Server server) {
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1302650&r1=1302649&r2=1302650&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Mar 19 20:48:49 2012
@@ -113,6 +113,11 @@
When stopping a Context, ensure that any Servlets registered with JMX
are unregistered. (markt)
</fix>
+ <scode>
+ Make the implementation of <code>Catalina.getParentClassLoader</code>
+ consistent with similar methods across the code base and have it return
+ the system class loader if no parent class loader is set. (markt)
+ </scode>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
