[jboss-cvs] JBossAS SVN: r57854 - projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/vfs

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2006-10-26 12:44:51 -0400 (Thu, 26 Oct 2006)
New Revision: 57854

Modified:
   projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/vfs/AbstractStructureDeployer.java
Log:
Don't let manifest add error fail the classpath addition, and only check the manifest on non-leafs.

Modified: projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/vfs/AbstractStructureDeployer.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/vfs/AbstractStructureDeployer.java	2006-10-26 16:37:44 UTC (rev 57853)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/vfs/AbstractStructureDeployer.java	2006-10-26 16:44:51 UTC (rev 57854)
@@ -130,9 +130,17 @@
       if( includeEntry )
          paths.add(entry);
       String rootPath = root.getPathName();
-      if( includeRootManifestCP )
+      if( includeRootManifestCP && entry.isLeaf() == false )
       {
-         VFSUtils.addManifestLocations(entry, paths);
+         try
+         {
+            VFSUtils.addManifestLocations(entry, paths);
+         }
+         catch(Exception e)
+         {
+            if( log.isTraceEnabled() )
+               log.trace("Failed to add manifest locations", e);
+         }
       }
       // Add to any existing classpath
       List<ClassPathInfo> pathInfo = new ArrayList<ClassPathInfo>();