Author: markt
Date: Sun Sep 14 13:43:15 2008
New Revision: 695284
URL: http://svn.apache.org/viewvc?rev=695284&view=rev
Log:
Improve previous fix to handle WAR deployment
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=695284&r1=695283&r2=695284&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Sun Sep 14
13:43:15 2008
@@ -994,15 +994,17 @@
// 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)))
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
