[jboss-cvs] JBossAS SVN: r99675 - projects/ejb3/branches/core-vfs3-int/src/main/java/org/jboss/ejb3/core/resolvers.

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

Author: johnbailey
Date: 2010-01-20 14:51:53 -0500 (Wed, 20 Jan 2010)
New Revision: 99675

Modified:
   projects/ejb3/branches/core-vfs3-int/src/main/java/org/jboss/ejb3/core/resolvers/ScopedEJBReferenceResolver.java
Log:
Merge changes from trunk -r 99414:99674

Modified: projects/ejb3/branches/core-vfs3-int/src/main/java/org/jboss/ejb3/core/resolvers/ScopedEJBReferenceResolver.java
===================================================================
--- projects/ejb3/branches/core-vfs3-int/src/main/java/org/jboss/ejb3/core/resolvers/ScopedEJBReferenceResolver.java	2010-01-20 19:46:21 UTC (rev 99674)
+++ projects/ejb3/branches/core-vfs3-int/src/main/java/org/jboss/ejb3/core/resolvers/ScopedEJBReferenceResolver.java	2010-01-20 19:51:53 UTC (rev 99675)
@@ -40,7 +40,10 @@
    protected String find(DeploymentUnit du, EjbReference reference)
    {
       JBossMetaData metadata = getMetaData(du);
-
+      if (metadata == null)
+      {
+         return null;
+      }
       return getMatch(reference, metadata, du.getClassLoader());
    }