tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1200399 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Date Thu, 10 Nov 2011 16:05:24 GMT
Author: markt
Date: Thu Nov 10 16:05:24 2011
New Revision: 1200399

URL: http://svn.apache.org/viewvc?rev=1200399&view=rev
Log:
When deploying a specific named app, don't try and deploy it multiple
ways.

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=1200399&r1=1200398&r2=1200399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Thu Nov 10 16:05:24 2011
@@ -502,15 +502,19 @@ public class HostConfig
             return;
         }
 
-        // Deploy XML descriptors from configBase
+        // Deploy XML descriptor from configBase
         File xml = new File(configBase, baseName + ".xml");
-        if (xml.exists())
+        if (xml.exists()) {
             deployDescriptor(cn, xml);
-        // Deploy WARs
+            return;
+        }
+        // Deploy WAR
         File war = new File(appBase, baseName + ".war");
-        if (war.exists())
+        if (war.exists()) {
             deployWAR(cn, war);
-        // Deploy expanded folders
+            return;
+        }
+        // Deploy expanded folder
         File dir = new File(appBase, baseName);
         if (dir.exists())
             deployDirectory(cn, dir);



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


Mime
View raw message