Author: markt
Date: Fri Nov 9 12:02:41 2018
New Revision: 1846239
URL: http://svn.apache.org/viewvc?rev=1846239&view=rev
Log:
Correct previous merge error
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1846239&r1=1846238&r2=1846239&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Fri Nov 9 12:02:41 2018
@@ -575,7 +575,6 @@ public abstract class WebappClassLoaderB
private boolean clearReferencesHttpClientKeepAliveThread = true;
/**
-<<<<<<< .working
* Name of associated context used with logging and JMX to associate with
* the right web application. Particularly useful for the clear references
* messages. Defaults to unknown but if standard Tomcat components are used
@@ -584,15 +583,12 @@ public abstract class WebappClassLoaderB
private String contextName = "unknown";
/**
-||||||| .merge-left.r1826689
-=======
* Should Tomcat attempt to clear references to classes loaded by this
class
* loader from the ObjectStreamClass caches?
*/
private boolean clearReferencesObjectStreamClassCaches = true;
/**
->>>>>>> .merge-right.r1826690
* Holds the class file transformers decorating this class loader. The
* CopyOnWriteArrayList is thread safe. It is expensive on writes, but
* those should be rare. It is very fast on reads, since synchronization
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
