[jboss-cvs] JBossAS SVN: r76603 - trunk/ejb3/src/main/org/jboss/ejb3/client.

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

Author: emuckenhuber
Date: 2008-08-04 10:11:10 -0400 (Mon, 04 Aug 2008)
New Revision: 76603

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/client/ClientResourceHandler.java
Log:
[JBAS-5830] use resolved jndi name

Modified: trunk/ejb3/src/main/org/jboss/ejb3/client/ClientResourceHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/client/ClientResourceHandler.java	2008-08-04 12:50:54 UTC (rev 76602)
+++ trunk/ejb3/src/main/org/jboss/ejb3/client/ClientResourceHandler.java	2008-08-04 14:11:10 UTC (rev 76603)
@@ -191,7 +191,12 @@
          String encName = "env/" + envRef.getMessageDestinationRefName();
          String jndiName = envRef.getMappedName();
          if (jndiName == null || jndiName.equals(""))
-            throw new RuntimeException("mapped-name or message-destination-link is required for " + envRef.getMessageDestinationRefName() + " of deployment " + container.getIdentifier());
+         {
+            // Look for a message-destination-link
+            jndiName = envRef.getResolvedJndiName();
+            if (jndiName == null)    
+               throw new RuntimeException("message-destination has no jndi-name/resolved-jndi-name " + envRef);
+         }
             
          Utils.injectionTarget(encName, envRef, container);
       }