svn commit: r1626971 - /ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java

[ja...@apache.org]

Author: jacopoc
Date: Tue Sep 23 09:24:37 2014
New Revision: 1626971

URL: http://svn.apache.org/r1626971
Log:
Removed some code that was not used by the CatalinaContainer.

Modified:
    ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java

Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=1626971&r1=1626970&r2=1626971&view=diff
==============================================================================
--- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original)
+++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Tue Sep 23 09:24:37 2014
@@ -41,7 +41,6 @@ import org.apache.catalina.Host;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.Manager;
 import org.apache.catalina.connector.Connector;
-import org.apache.catalina.core.JreMemoryLeakPreventionListener;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.core.StandardEngine;
 import org.apache.catalina.core.StandardHost;
@@ -140,7 +139,7 @@ public class CatalinaContainer implement
     public static final String module = CatalinaContainer.class.getName();
     private static final ThreadGroup CATALINA_THREAD_GROUP = new ThreadGroup("CatalinaContainer");
 
-    // load the JSSE propertes (set the trust store)
+    // load the JSSE properties (set the trust store)
     static {
         SSLUtil.loadJsseProperties();
     }
@@ -185,17 +184,6 @@ public class CatalinaContainer implement
         tomcat = new Tomcat();
         tomcat.setBaseDir(System.getProperty("ofbiz.home"));
 
-        // https://tomcat.apache.org/tomcat-7.0-doc/config/listeners.html#JRE_Memory_Leak_Prevention_Listener_-_org.apache.catalina.core.JreMemoryLeakPreventionListener
-        // <<The JRE Memory Leak Prevention Listener provides work-arounds for known places where the Java Runtime environment uses
-        // the context class loader to load a singleton as this will cause a memory leak if a web application class loader happens
-        // to be the context class loader at the time.>>
-        // http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?view=annotate
-        JreMemoryLeakPreventionListener jreMemoryLeakPreventionListener = new JreMemoryLeakPreventionListener();
-        // Mostly use default config, but some specific cases here
-        jreMemoryLeakPreventionListener.setAppContextProtection(true); // True is the default for Java 1.6, use false for Java from 1.7.0_02 onwards (see sources above)
-        jreMemoryLeakPreventionListener.setGcDaemonProtection(false); // False because of https://mail-archives.apache.org/mod_mbox/tomcat-users/201008.mbox/%3CAANLkTino=BjP5LsBCwncB2HvNDzyKLr5y-8yWdt15a89@mail.gmail.com%3E
-        jreMemoryLeakPreventionListener.setUrlCacheProtection(false); // False to keep the URLConnection cache, moot point
-
         // configure JNDI in the StandardServer
         StandardServer server = (StandardServer) tomcat.getServer();
         if (useNaming) {