svn commit: r1409135 - in /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb: core/mdb/EndpointFactory.java util/proxy/LocalBeanProxyFactory.java

[rmannibucau]

Author: rmannibucau
Date: Wed Nov 14 10:05:01 2012
New Revision: 1409135

URL: http://svn.apache.org/viewvc?rev=1409135&view=rev
Log:
LocalBeanProxyFactory.newProxyInstance can only throw InternalError

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java?rev=1409135&r1=1409134&r2=1409135&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java
 Wed Nov 14 10:05:01 2012
@@ -28,7 +28,6 @@ import javax.resource.spi.endpoint.Messa
 import javax.transaction.xa.XAResource;
 import javax.management.ObjectName;
 import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -65,21 +64,17 @@ public class EndpointFactory implements 
             xaResource = xaResourceWrapper.wrap(xaResource, 
container.getContainerID().toString());
         }
         EndpointHandler endpointHandler = new EndpointHandler(container, 
beanContext, instanceFactory, xaResource);
-        MessageEndpoint messageEndpoint = null;
         try {
-            messageEndpoint = (MessageEndpoint) 
LocalBeanProxyFactory.newProxyInstance(classLoader, endpointHandler, 
beanContext.getBeanClass(), interfaces);
-//            messageEndpoint = (MessageEndpoint) 
Proxy.newProxyInstance(classLoader, interfaces, endpointHandler);
-        } catch (IllegalArgumentException e) {
+            return (MessageEndpoint) 
LocalBeanProxyFactory.newProxyInstance(classLoader, endpointHandler, 
beanContext.getBeanClass(), interfaces);
+        } catch (InternalError e) {
             //try to create the proxy with tccl once again.
             ClassLoader tccl = Thread.currentThread().getContextClassLoader();
             if (tccl != null) {
-                messageEndpoint = (MessageEndpoint) 
LocalBeanProxyFactory.newProxyInstance(tccl, endpointHandler, 
beanContext.getBeanClass(), interfaces);
-//                messageEndpoint = (MessageEndpoint) 
Proxy.newProxyInstance(tccl, interfaces, endpointHandler);
+                return (MessageEndpoint) 
LocalBeanProxyFactory.newProxyInstance(tccl, endpointHandler, 
beanContext.getBeanClass(), interfaces);
             } else {
                 throw e;
             }
         }
-        return messageEndpoint;
     }
 
     public MessageEndpoint createEndpoint(XAResource xaResource, long timeout) 
 throws UnavailableException {

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java?rev=1409135&r1=1409134&r2=1409135&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
 Wed Nov 14 10:05:01 2012
@@ -52,7 +52,6 @@ public class LocalBeanProxyFactory imple
 
     public static Object newProxyInstance(ClassLoader classLoader, 
InvocationHandler handler, Class classToSubclass, final Class... interfaces) 
throws IllegalArgumentException {
         try {
-
             final Class proxyClass = createProxy(classToSubclass, classLoader, 
interfaces);
             return constructProxy(proxyClass, handler);
         } catch (Throwable e) {