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

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

Author: scott.stark at jboss.org
Date: 2008-09-03 11:57:14 -0400 (Wed, 03 Sep 2008)
New Revision: 77852

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
Log:
JBAS-5920, guard against non-ear parents

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	2008-09-03 15:22:28 UTC (rev 77851)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	2008-09-03 15:57:14 UTC (rev 77852)
@@ -127,16 +127,19 @@
          {
             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(earMD != null)
             {
-               if(vf.getPathName().startsWith(libDirPrefix))
+               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);
+                  }
                }
             }
          }