Author: markt
Date: Tue Nov 5 00:05:30 2013
New Revision: 1538833
URL: http://svn.apache.org/r1538833
Log:
Rename. Loader is a poor choice as there is a separate Loader component
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.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=1538833&r1=1538832&r2=1538833&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Tue Nov
5 00:05:30 2013
@@ -686,23 +686,22 @@ public class WebappClassLoader extends U
@Override
public WebappClassLoader copyWithoutTransformers() {
- WebappClassLoader loader = new WebappClassLoader(this.parent);
+ WebappClassLoader result = new WebappClassLoader(this.parent);
- loader.resources = this.resources;
- loader.delegate = this.delegate;
- loader.started = this.started;
- loader.needConvert = this.needConvert;
- loader.clearReferencesStatic = this.clearReferencesStatic;
- loader.clearReferencesStopThreads = this.clearReferencesStopThreads;
- loader.clearReferencesStopTimerThreads =
this.clearReferencesStopTimerThreads;
- loader.clearReferencesLogFactoryRelease =
this.clearReferencesLogFactoryRelease;
- loader.clearReferencesHttpClientKeepAliveThread =
this.clearReferencesHttpClientKeepAliveThread;
+ result.resources = this.resources;
+ result.delegate = this.delegate;
+ result.started = this.started;
+ result.needConvert = this.needConvert;
+ result.clearReferencesStatic = this.clearReferencesStatic;
+ result.clearReferencesStopThreads = this.clearReferencesStopThreads;
+ result.clearReferencesStopTimerThreads =
this.clearReferencesStopTimerThreads;
+ result.clearReferencesLogFactoryRelease =
this.clearReferencesLogFactoryRelease;
+ result.clearReferencesHttpClientKeepAliveThread =
this.clearReferencesHttpClientKeepAliveThread;
- loader.permissionList.addAll(this.permissionList);
- loader.loaderPC.putAll(this.loaderPC);
-
- return loader;
+ result.permissionList.addAll(this.permissionList);
+ result.loaderPC.putAll(this.loaderPC);
+ return result;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
