tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1361981 - in /tomcat/trunk: java/org/apache/catalina/loader/WebappClassLoader.java modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/
Date Mon, 16 Jul 2012 12:00:26 GMT
Author: rjung
Date: Mon Jul 16 12:00:25 2012
New Revision: 1361981

URL: http://svn.apache.org/viewvc?rev=1361981&view=rev
Log:
Revert r1361432: method is not unused.
WebappLoader uses it via reflection.

Note: the spurious remove of svn:mergeinfo from
jdbc doesn't harm, it was empty.

Modified:
    tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
    tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/   (props changed)
    tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/   (props changed)

Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1361981&r1=1361980&r2=1361981&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Mon Jul 16 12:00:25
2012
@@ -236,8 +236,33 @@ public class WebappClassLoader
     }
 
 
+    /**
+     * Construct a new ClassLoader with no defined repositories and the given
+     * parent ClassLoader.
+     *
+     * @param parent Our parent class loader
+     *
+     * @deprecated  Unused - will be removed in 8.0.x
+     */
+    @Deprecated
+    public WebappClassLoader(ClassLoader parent) {
+
+        super(new URL[0], parent);
+
+        this.parent = getParent();
+
+        system = getSystemClassLoader();
+        securityManager = System.getSecurityManager();
+
+        if (securityManager != null) {
+            refreshPolicy();
+        }
+    }
+
+
     // ----------------------------------------------------- Instance Variables
 
+
     /**
      * Associated directory context giving access to the resources in this
      * webapp.

Propchange: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/
            ('svn:mergeinfo' removed)

Propchange: tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/
            ('svn:mergeinfo' removed)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message