[jbossweb-commits] JBossWeb SVN: r706 - in trunk: webapps/docs and 1 other directory.
Author: remy.maucherat(a)jboss.com
Date: 2008-07-10 12:50:49 -0400 (Thu, 10 Jul 2008)
New Revision: 706
Modified:
trunk/java/org/apache/catalina/util/ExtensionValidator.java
trunk/webapps/docs/changelog.xml
Log:
- JBAS-4965: Ignore exploded .jars instead of running into a classcast.
Modified: trunk/java/org/apache/catalina/util/ExtensionValidator.java
===================================================================
--- trunk/java/org/apache/catalina/util/ExtensionValidator.java 2008-07-09 15:56:30 UTC
(rev 705)
+++ trunk/java/org/apache/catalina/util/ExtensionValidator.java 2008-07-10 16:50:49 UTC
(rev 706)
@@ -179,15 +179,17 @@
if (!binding.getName().toLowerCase().endsWith(".jar")) {
continue;
}
- Resource resource = (Resource)dirContext.lookup
- ("/WEB-INF/lib/" + binding.getName());
- Manifest jmanifest = getManifest(resource.streamContent());
- if (jmanifest != null) {
- ManifestResource mre = new ManifestResource(
- binding.getName(),
- jmanifest,
- ManifestResource.APPLICATION);
- appManifestResources.add(mre);
+ Object resourceObject = dirContext.lookup("/WEB-INF/lib/" +
binding.getName());
+ if (resourceObject instanceof Resource) {
+ Resource resource = (Resource) resourceObject;
+ Manifest jmanifest = getManifest(resource.streamContent());
+ if (jmanifest != null) {
+ ManifestResource mre = new ManifestResource(
+ binding.getName(),
+ jmanifest,
+ ManifestResource.APPLICATION);
+ appManifestResources.add(mre);
+ }
}
}
} catch (NamingException nex) {
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-07-09 15:56:30 UTC (rev 705)
+++ trunk/webapps/docs/changelog.xml 2008-07-10 16:50:49 UTC (rev 706)
@@ -16,6 +16,16 @@
<body>
+<section name="JBoss Web 2.1.1.CR5 (remm)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <jboss-jira>JBAS-4965</jboss-jira>: Ignore exploded JARs in extension
validator to avoid classcast. (remm)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 2.1.1.CR4 (remm)">
<subsection name="General">
<changelog>