[jboss-cvs] JBossAS SVN: r84025 - in projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3: stateful and 1 other directories.

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

Author: ALRubinger
Date: 2009-02-09 21:45:37 -0500 (Mon, 09 Feb 2009)
New Revision: 84025

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionContainer.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionSpecContainer.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulSessionContextDelegate.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessSessionContextImpl.java
Log:
[EJBTHREE-1641] Resolve "ejbcontext" regressions from removal of old proxy impl

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionContainer.java	2009-02-10 02:18:00 UTC (rev 84024)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionContainer.java	2009-02-10 02:45:37 UTC (rev 84025)
@@ -122,8 +122,15 @@
    {
       assert binding!=null : LocalBinding.class.getSimpleName() + " must be specified";
       
+      // Find the jndiName
+      String jndiName = this.getMetaData().getLocalJndiName();
+      if(binding!=null)
+      {
+         jndiName = binding.jndiBinding();
+      }
+      
       // Get the Registry name
-      String proxyFactoryRegistryBindName = this.getJndiRegistrar().getProxyFactoryRegistryKey(binding.jndiBinding(), this.getMetaData(), true);
+      String proxyFactoryRegistryBindName = this.getJndiRegistrar().getProxyFactoryRegistryKey(jndiName, this.getMetaData(), true);
       
       // Return
       return this.getProxyFactory(proxyFactoryRegistryBindName);

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionSpecContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionSpecContainer.java	2009-02-10 02:18:00 UTC (rev 84024)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionSpecContainer.java	2009-02-10 02:45:37 UTC (rev 84025)
@@ -16,8 +16,6 @@
 import org.jboss.aop.util.MethodHashing;
 import org.jboss.ejb3.Ejb3Deployment;
 import org.jboss.ejb3.ThreadLocalStack;
-import org.jboss.ejb3.annotation.LocalBinding;
-import org.jboss.ejb3.annotation.RemoteBinding;
 import org.jboss.ejb3.common.lang.SerializableMethod;
 import org.jboss.ejb3.common.registrar.spi.Ejb3RegistrarLocator;
 import org.jboss.ejb3.proxy.container.InvokableContext;
@@ -69,52 +67,6 @@
       super(cl, beanClassName, ejbName, domain, ctxProperties, deployment, beanMetaData);
    }
 
-//   /**
-//    * Create a remote proxy (EJBObject) for an enterprise bean identified by id
-//    * 
-//    * @param id
-//    * @return
-//    * @throws Exception
-//    */
-//   public Object createProxyRemoteEjb21() throws Exception
-//   {
-//      RemoteBinding binding = this.getRemoteBinding();
-//      return this.createProxyRemoteEjb21(binding);
-//   }
-//
-//   /**
-//    * Create a remote proxy (EJBObject) for an enterprise bean identified by id on a given binding
-//    * 
-//    * @param id
-//    * @param binding
-//    * @return
-//    * @throws Exception
-//    */
-//   public abstract Object createProxyRemoteEjb21(RemoteBinding binding) throws Exception;
-//
-//   /**
-//    * Create a local proxy (EJBLocalObject) for an enterprise bean identified by id
-//    * 
-//    * @param id
-//    * @return
-//    * @throws Exception
-//    */
-//   public Object createProxyLocalEjb21() throws Exception
-//   {
-//      LocalBinding binding = this.getAnnotation(LocalBinding.class);
-//      return this.createProxyLocalEjb21(binding);
-//   }
-//
-//   /**
-//    * Create a local proxy (EJBLocalObject) for an enterprise bean identified by id, with
-//    * the specified LocalBinding
-//    * 
-//    * @param id
-//    * @return
-//    * @throws Exception
-//    */
-//   public abstract Object createProxyLocalEjb21(LocalBinding binding) throws Exception;
-
    /**
     * Invokes the method described by the specified serializable method
     * as called from the specified proxy, using the specified arguments

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulSessionContextDelegate.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulSessionContextDelegate.java	2009-02-10 02:18:00 UTC (rev 84024)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulSessionContextDelegate.java	2009-02-10 02:45:37 UTC (rev 84025)
@@ -51,7 +51,7 @@
          EJBLocalObject proxy = null;
          try
          {
-            proxy = (EJBLocalObject) container.createProxyLocalEjb21(id, null);
+            proxy = (EJBLocalObject) container.createProxyLocalEjb21(id);
          }
          // Proxy does not implement EJBLocalObject
          catch (ClassCastException cce)
@@ -80,7 +80,7 @@
          EJBObject proxy = null;
          try
          {
-            proxy = (EJBObject) container.createProxyRemoteEjb21(id, null);
+            proxy = (EJBObject) container.createProxyRemoteEjb21(id);
          }
          // Proxy does not implement EJBObject
          catch (ClassCastException cce)

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessSessionContextImpl.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessSessionContextImpl.java	2009-02-10 02:18:00 UTC (rev 84024)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessSessionContextImpl.java	2009-02-10 02:45:37 UTC (rev 84025)
@@ -51,7 +51,7 @@
    {
       try
       {
-         EJBLocalObject proxy = (EJBLocalObject) (StatelessContainer) container.createProxyLocalEjb21();
+         EJBLocalObject proxy = (EJBLocalObject) container.createProxyLocalEjb21();
          return proxy;
       }
       catch (Exception e)