[jboss-cvs] JBossAS SVN: r75569 - in projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3: stateful and 1 other directories.

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

Author: ALRubinger
Date: 2008-07-09 18:44:21 -0400 (Wed, 09 Jul 2008)
New Revision: 75569

Modified:
   projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/session/SessionContainer.java
   projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java
   projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/stateless/StatelessContainer.java
Log:
[EJBTHREE-1385][EJBTHREE-1060] Implement getInvokedBusinessInterface properly

Modified: projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/session/SessionContainer.java
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/session/SessionContainer.java	2008-07-09 22:44:02 UTC (rev 75568)
+++ projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/session/SessionContainer.java	2008-07-09 22:44:21 UTC (rev 75569)
@@ -131,7 +131,18 @@
       if (method == null) throw new IllegalStateException("getInvokedBusinessInterface() being invoked outside of a business invocation");
       if (method.getName() == null || method.getName().equals("")) throw new IllegalStateException("getInvokedBusinessInterface() being invoked outside of a business invocation");
       
+      String invokedBusinessInterfaceClassName = method.getActualClassName();
       Class<?> invokedBusinessInterface = null;
+      try
+      {
+         invokedBusinessInterface = this.getClassloader().loadClass(invokedBusinessInterfaceClassName);
+      }
+      catch (ClassNotFoundException e)
+      {
+         throw new RuntimeException("Invoked Business Interface on Proxy was set to "
+               + invokedBusinessInterfaceClassName + ", but this could not be loaded by the "
+               + ClassLoader.class.getSimpleName() + " for " + this);
+      }
       
       return invokedBusinessInterface;
    }
@@ -381,7 +392,7 @@
          ProxyUtils.addLocalAsynchronousInfo(nextInvocation, provider);
          try
          {
-            invokedMethod.push(new SerializableMethod(method));
+            invokedMethod.push(new SerializableMethod(method, method.getClass()));
             return nextInvocation.invokeNext();
          }
          finally

Modified: projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java	2008-07-09 22:44:02 UTC (rev 75568)
+++ projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java	2008-07-09 22:44:21 UTC (rev 75569)
@@ -429,7 +429,7 @@
             
             ProxyUtils.addLocalAsynchronousInfo(nextInvocation, provider);
             
-            invokedMethod.push(new SerializableMethod(method));
+            invokedMethod.push(new SerializableMethod(method, method.getClass()));
             return nextInvocation.invokeNext();
          }
          finally
@@ -547,7 +547,7 @@
    
                Object rtn = null;
                  
-               invokedMethod.push(new SerializableMethod(unadvisedMethod));
+               invokedMethod.push(new SerializableMethod(unadvisedMethod, unadvisedMethod.getClass()));
                rtn = newSi.invokeNext();
 
                response = marshallResponse(invocation, rtn, newSi.getResponseContextInfo());

Modified: projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/stateless/StatelessContainer.java
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/stateless/StatelessContainer.java	2008-07-09 22:44:02 UTC (rev 75568)
+++ projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/stateless/StatelessContainer.java	2008-07-09 22:44:21 UTC (rev 75569)
@@ -319,7 +319,7 @@
          {
             invokeStats.callIn();
             
-            invokedMethod.push(new SerializableMethod(unadvisedMethod));
+            invokedMethod.push(new SerializableMethod(unadvisedMethod, unadvisedMethod.getClass()));
 
             if (unadvisedMethod != null && isHomeMethod(unadvisedMethod))
             {
@@ -374,7 +374,7 @@
          {
             invokeStats.callIn();
             
-            invokedMethod.push(new SerializableMethod(unadvisedMethod));
+            invokedMethod.push(new SerializableMethod(unadvisedMethod, unadvisedMethod.getClass()));
             Map responseContext = null;
             Object rtn = null;
             if (unadvisedMethod != null && isHomeMethod(unadvisedMethod))