geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r943409 - in /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat: GeronimoStandardContext.java TomcatWebAppContext.java
Date Wed, 12 May 2010 08:34:54 GMT
Author: xuhaihong
Date: Wed May 12 08:34:53 2010
New Revision: 943409

URL: http://svn.apache.org/viewvc?rev=943409&view=rev
Log:
Before finding a better way to determine whether or not need to flush the resource directories,
we always flush the folders when staring the web applications

Modified:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java?rev=943409&r1=943408&r2=943409&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
Wed May 12 08:34:53 2010
@@ -97,7 +97,7 @@ public class GeronimoStandardContext ext
 
     private static final boolean allowLinking = Boolean.getBoolean("org.apache.geronimo.tomcat.GeronimoStandardContext.allowLinking");
 
-    private static final boolean FLUSH_STATIC_RESOURCES_ON_STARTUP = Boolean.getBoolean("org.apache.geronimo.tomcat.GeronimoStandardContext.flushStaticResourcesOnStartup");
+    //private static final boolean FLUSH_STATIC_RESOURCES_ON_STARTUP = Boolean.getBoolean("org.apache.geronimo.tomcat.GeronimoStandardContext.flushStaticResourcesOnStartup");
 
     private Subject defaultSubject = null;
     private RunAsSource runAsSource = RunAsSource.NULL;
@@ -587,7 +587,7 @@ public class GeronimoStandardContext ext
         File resourceRootDirectory = new File(tomcatHome + File.separator + "resources" +
File.separator + serviceName + File.separator + engineName + File.separator + hostName + File.separator
                 + (getName().equals("/") ? "_" : getName()));
         File completeFlagFile = new File(resourceRootDirectory, "complete.flag");
-        if (!resourceRootDirectory.exists() || FLUSH_STATIC_RESOURCES_ON_STARTUP || !completeFlagFile.exists())
{
+        //if (!resourceRootDirectory.exists() || FLUSH_STATIC_RESOURCES_ON_STARTUP || !completeFlagFile.exists())
{
             try {
                 completeFlagFile.delete();
                 FileUtils.recursiveDelete(resourceRootDirectory);
@@ -629,7 +629,7 @@ public class GeronimoStandardContext ext
             } catch (IOException e) {
                 throw new DeploymentException("Fail to create static resoruce cache for jar
files in WEB-INF folder", e);
             }
-        }
+        //}
         for (File resourceDirectory : resourceRootDirectory.listFiles()) {
             if (resourceDirectory.isDirectory() && resourceDirectory.getName().endsWith(".jar")
&& resourceDirectory.listFiles().length > 0) {
                 FileDirContext fileDirContext = new FileDirContext();

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?rev=943409&r1=943408&r2=943409&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
Wed May 12 08:34:53 2010
@@ -576,20 +576,12 @@ public class TomcatWebAppContext impleme
         statsProvider = null;
         container.removeContext(this);
         DirContextURLStreamHandler.unbind(classLoader);
-
-        // No more logging will occur for this ClassLoader. Inform the LogFactory to avoid
a memory leak.
-//        LogFactory.release(classLoader);
-
         log.debug("TomcatWebAppContext stopped");
     }
 
     public void doFail() {
         statsProvider = null;
         container.removeContext(this);
-
-        // No more logging will occur for this ClassLoader. Inform the LogFactory to avoid
a memory leak.
-//        LogFactory.release(classLoader);
-
         log.warn("TomcatWebAppContext failed");
     }
 



Mime
View raw message