Author: markt
Date: Mon Nov 4 23:58:15 2013
New Revision: 1538818
URL: http://svn.apache.org/r1538818
Log:
Remove now unused loaderDir
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
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=1538818&r1=1538817&r2=1538818&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Mon Nov
4 23:58:15 2013
@@ -338,12 +338,6 @@ public class WebappClassLoader extends U
/**
- * Path where resources loaded from JARs will be extracted.
- */
- protected File loaderDir = null;
- protected String canonicalLoaderDir = null;
-
- /**
* The PermissionCollection for each CodeSource for a web
* application context.
*/
@@ -568,25 +562,6 @@ public class WebappClassLoader extends U
}
- /**
- * Change the work directory.
- */
- public void setWorkDir(File workDir) {
- this.loaderDir = new File(workDir, "loader");
- if (loaderDir == null) {
- canonicalLoaderDir = null;
- } else {
- try {
- canonicalLoaderDir = loaderDir.getCanonicalPath();
- if (!canonicalLoaderDir.endsWith(File.separator)) {
- canonicalLoaderDir += File.separator;
- }
- } catch (IOException ioe) {
- canonicalLoaderDir = null;
- }
- }
- }
-
/**
* Utility method for use in subclasses.
* Must be called before Lifecycle methods to have any effect.
@@ -769,8 +744,6 @@ public class WebappClassLoader extends U
loader.delegate = this.delegate;
loader.lastJarAccessed = this.lastJarAccessed;
loader.jarPath = this.jarPath;
- loader.loaderDir = this.loaderDir;
- loader.canonicalLoaderDir = this.canonicalLoaderDir;
loader.started = this.started;
loader.needConvert = this.needConvert;
loader.clearReferencesStatic = this.clearReferencesStatic;
@@ -1649,11 +1622,6 @@ public class WebappClassLoader extends U
permissionList.clear();
loaderPC.clear();
-
- if (loaderDir != null) {
- deleteDir(loaderDir);
- }
-
}
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1538818&r1=1538817&r2=1538818&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Mon Nov 4
23:58:15 2013
@@ -680,8 +680,6 @@ public class WebappLoader extends Lifecy
if( log.isDebugEnabled() && workDir != null)
log.debug(sm.getString("webappLoader.deploy",
workDir.getAbsolutePath()));
- classLoader.setWorkDir(workDir);
-
WebResourceRoot resources = context.getResources();
// Setting up the class repository (/WEB-INF/classes), if it exists
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
