From b2748988c57f9a08e07ebd8d0e5162d4ab27f11a Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 14 Sep 2008 20:43:15 +0000 Subject: [PATCH] Improve previous fix to handle WAR deployment git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@695284 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/loader/WebappLoader.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/java/org/apache/catalina/loader/WebappLoader.java b/java/org/apache/catalina/loader/WebappLoader.java index 30453db12..cdc7fcb15 100644 --- a/java/org/apache/catalina/loader/WebappLoader.java +++ b/java/org/apache/catalina/loader/WebappLoader.java @@ -994,15 +994,17 @@ public class WebappLoader // impossible to update it or remove it at runtime) File destFile = new File(destDir, binding.getName()); - // Ignore directories named xxx.jar - if (destFile.isDirectory()) - continue; - if( log.isDebugEnabled()) log.debug(sm.getString("webappLoader.jarDeploy", filename, destFile.getAbsolutePath())); - Resource jarResource = (Resource) binding.getObject(); + Object obj = binding.getObject(); + + if (!(obj instanceof Resource)) + continue; + + Resource jarResource = (Resource) obj; + if (copyJars) { if (!copy(jarResource.streamContent(), new FileOutputStream(destFile))) -- 2.11.0