[jboss-cvs] JBossAS SVN: r77658 - trunk/ejb3/src/main/org/jboss/ejb3/deployers.

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

Author: scott.stark at jboss.org
Date: 2008-08-29 11:35:21 -0400 (Fri, 29 Aug 2008)
New Revision: 77658

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
Log:
JBAS-5899, validate that there is an ear unit before looking at the ear lib classpath

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	2008-08-29 15:17:43 UTC (rev 77657)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	2008-08-29 15:35:21 UTC (rev 77658)
@@ -123,18 +123,21 @@
          }
          // Also need to include the ear lib dir entries
          VFSDeploymentUnit earUnit = unit.getParent();
-         List<VirtualFile> earClassPath = earUnit.getClassPath();
-         JBossAppMetaData earMD = earUnit.getAttachment(JBossAppMetaData.class);
-         String libDir = earMD.getLibraryDirectory();
-         if(libDir == null)
-            libDir = "lib";
-         String libDirPrefix = libDir + "/";
-         for(VirtualFile vf : earClassPath)
+         if(earUnit != null)
          {
-            if(vf.getPathName().startsWith(libDirPrefix))
+            List<VirtualFile> earClassPath = earUnit.getClassPath();
+            JBossAppMetaData earMD = earUnit.getAttachment(JBossAppMetaData.class);
+            String libDir = earMD.getLibraryDirectory();
+            if(libDir == null)
+               libDir = "lib";
+            String libDirPrefix = libDir + "/";
+            for(VirtualFile vf : earClassPath)
             {
-               String uri = vf.toURI().toString();
-               cpURIs.add(uri);
+               if(vf.getPathName().startsWith(libDirPrefix))
+               {
+                  String uri = vf.toURI().toString();
+                  cpURIs.add(uri);
+               }
             }
          }