tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1380891 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Date Tue, 04 Sep 2012 21:16:30 GMT
Author: markt
Date: Tue Sep  4 21:16:30 2012
New Revision: 1380891

URL: http://svn.apache.org/viewvc?rev=1380891&view=rev
Log:
Re-order. Do cheaper tests first. Makes small improvement to background thread processing
time when lots of WARs are deployed.

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1380891&r1=1380890&r2=1380891&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue Sep  4 21:16:30 2012
@@ -676,6 +676,9 @@ public class HostConfig
 
                 ContextName cn = new ContextName(files[i]);
 
+                if (isServiced(cn.getName()) || deploymentExists(cn.getName()))
+                    continue;
+
                 // Check for WARs with /../ /./ or similar sequences in the name
                 if (!validateContextPath(appBase, cn.getBaseName())) {
                     log.error(sm.getString(
@@ -684,9 +687,6 @@ public class HostConfig
                     continue;
                 }
 
-                if (isServiced(cn.getName()) || deploymentExists(cn.getName()))
-                    continue;
-
                 results.add(es.submit(new DeployWar(this, cn, war)));
             }
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message