From 8db4a480582aacac406d9316cff167104ee6acbf Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 13 Oct 2011 12:12:47 +0000 Subject: [PATCH] Fix copy paste error s/dir/war/ git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1182796 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/startup/HostConfig.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/org/apache/catalina/startup/HostConfig.java b/java/org/apache/catalina/startup/HostConfig.java index 14ce01b90..faa033db6 100644 --- a/java/org/apache/catalina/startup/HostConfig.java +++ b/java/org/apache/catalina/startup/HostConfig.java @@ -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); } } } -- 2.11.0