Author: markt
Date: Thu Oct 13 12:12:47 2011
New Revision: 1182796
URL: http://svn.apache.org/viewvc?rev=1182796&view=rev
Log:
Fix copy paste error s/dir/war/
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=1182796&r1=1182795&r2=1182796&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Thu Oct 13
12:12:47 2011
@@ -676,8 +676,8 @@ public class HostConfig
continue;
if (files[i].equalsIgnoreCase("WEB-INF"))
continue;
- File dir = new File(appBase, files[i]);
- if (files[i].toLowerCase(Locale.ENGLISH).endsWith(".war") &&
dir.isFile()
+ File war = new File(appBase, files[i]);
+ if (files[i].toLowerCase(Locale.ENGLISH).endsWith(".war") &&
war.isFile()
&& !invalidWars.contains(files[i]) ) {
ContextName cn = new ContextName(files[i]);
@@ -693,7 +693,7 @@ public class HostConfig
if (isServiced(cn.getName()))
continue;
- deployWAR(cn, dir);
+ deployWAR(cn, war);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
