[jboss-cvs] JBossAS SVN: r74570 - projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar.

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

Author: ALRubinger
Date: 2008-06-14 19:06:35 -0400 (Sat, 14 Jun 2008)
New Revision: 74570

Modified:
   projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java
Log:
[EJBTHREE-1345] Ensure ProxyFactory bind names are unique

Modified: projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java
===================================================================
--- projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java	2008-06-14 21:54:36 UTC (rev 74569)
+++ projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java	2008-06-14 23:06:35 UTC (rev 74570)
@@ -71,18 +71,6 @@
     */
    private static final String KEY_SUFFIX_PROXY_FACTORY_REGISTRY = "/ProxyFactory";
 
-   /**
-    * The value appended to the key used to bind local proxy factories to the registry
-    */
-   private static final String KEY_SUFFIX_PROXY_FACTORY_REGISTRY_LOCAL = JndiSessionRegistrarBase.KEY_SUFFIX_PROXY_FACTORY_REGISTRY
-         + "/local";
-
-   /**
-    * The value appended to the key used to bind local remote factories to the registry
-    */
-   private static final String KEY_SUFFIX_PROXY_FACTORY_REGISTRY_REMOTE = JndiSessionRegistrarBase.KEY_SUFFIX_PROXY_FACTORY_REGISTRY
-         + "/remote";
-
    private static final String OBJECT_FACTORY_CLASSNAME_PREFIX = "Proxy for: ";
 
    //TODO Remove
@@ -682,7 +670,7 @@
     * Returns the name of the unique key under which a Proxy Factory will 
     * be registered.  Will follow form:
     * 
-    * ejbName/ProxyFactory/(local|remote)
+    * (jndiName)/ProxyFactory/
     * 
     * ...depending upon the specified "isLocal" flag
     * 
@@ -692,20 +680,20 @@
    protected String getProxyFactoryRegistryKey(JBossEnterpriseBeanMetaData md, boolean isLocal)
    {
       // Initialize
-      String suffix = null;
+      String prefix = null;
 
       // Set Suffix
       if (isLocal)
       {
-         suffix = JndiSessionRegistrarBase.KEY_SUFFIX_PROXY_FACTORY_REGISTRY_LOCAL;
+         prefix = md.determineLocalJndiName();
       }
       else
       {
-         suffix = JndiSessionRegistrarBase.KEY_SUFFIX_PROXY_FACTORY_REGISTRY_REMOTE;
+         prefix = md.determineJndiName();
       }
 
       // Assemble and return
-      String key = md.getEjbName() + suffix;
+      String key = prefix + JndiSessionRegistrarBase.KEY_SUFFIX_PROXY_FACTORY_REGISTRY;
       return key;
    }