[jboss-cvs] JBossAS SVN: r83666 - in projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/resolvers: spi and 1 other directory.

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

Author: ALRubinger
Date: 2009-01-30 05:39:17 -0500 (Fri, 30 Jan 2009)
New Revision: 83666

Modified:
   projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/resolvers/plugins/FirstMatchEjbReferenceResolver.java
   projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/resolvers/spi/EjbReferenceResolverBase.java
Log:
[EJBTHREE-1693] Use DeploymentUnit.getTopLevel, do not duplicate logic

Modified: projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/resolvers/plugins/FirstMatchEjbReferenceResolver.java
===================================================================
--- projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/resolvers/plugins/FirstMatchEjbReferenceResolver.java	2009-01-30 10:36:39 UTC (rev 83665)
+++ projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/resolvers/plugins/FirstMatchEjbReferenceResolver.java	2009-01-30 10:39:17 UTC (rev 83666)
@@ -64,7 +64,7 @@
       String jndiName = null;
 
       // Resolve from the root deployment
-      DeploymentUnit root = this.getRoot(du);
+      DeploymentUnit root = du.getTopLevel();
       jndiName = this.resolveEjbFromRoot(root, reference);
 
       // Check that we could resolve

Modified: projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/resolvers/spi/EjbReferenceResolverBase.java
===================================================================
--- projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/resolvers/spi/EjbReferenceResolverBase.java	2009-01-30 10:36:39 UTC (rev 83665)
+++ projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/resolvers/spi/EjbReferenceResolverBase.java	2009-01-30 10:39:17 UTC (rev 83666)
@@ -388,16 +388,4 @@
 
    }
 
-   /**
-    * Obtains the root deployment unit 
-    * 
-    * @param du
-    * @return
-    */
-   protected DeploymentUnit getRoot(DeploymentUnit du)
-   {
-      // Recurse until we hit the root
-      return du.getParent() == null ? du : this.getRoot(du.getParent());
-   }
-
 }