[jbossweb-commits] JBossWeb SVN: r778 - in trunk: webapps/docs and 1 other directory.
Author: remy.maucherat(a)jboss.com
Date: 2008-09-15 08:59:10 -0400 (Mon, 15 Sep 2008)
New Revision: 778
Modified:
trunk/java/org/apache/catalina/loader/WebappLoader.java
trunk/webapps/docs/changelog.xml
Log:
- Additional fix (cosmetic, it didn't seem to do anything serious) for .jar folders in
/web-inf/lib.
Modified: trunk/java/org/apache/catalina/loader/WebappLoader.java
===================================================================
--- trunk/java/org/apache/catalina/loader/WebappLoader.java 2008-09-11 17:02:55 UTC (rev
777)
+++ trunk/java/org/apache/catalina/loader/WebappLoader.java 2008-09-15 12:59:10 UTC (rev
778)
@@ -996,7 +996,11 @@
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)))
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-09-11 17:02:55 UTC (rev 777)
+++ trunk/webapps/docs/changelog.xml 2008-09-15 12:59:10 UTC (rev 778)
@@ -16,6 +16,22 @@
<body>
+<section name="JBoss Web 2.1.1.GA (remm)">
+ <subsection name="Catalina">
+ <changelog>
+ <bug>45785</bug>: Add a check in the loader in addition to the fix for
JBAS-4965. (markt)
+ </changelog>
+ </subsection>
+ <subsection name="Coyote">
+ <changelog>
+ </changelog>
+ </subsection>
+ <subsection name="Jasper">
+ <changelog>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 2.1.1.CR7 (remm)">
<subsection name="Catalina">
<changelog>