svn commit: r1427029 - /openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java

[dblevins]

Author: dblevins
Date: Mon Dec 31 00:50:53 2012
New Revision: 1427029

URL: http://svn.apache.org/viewvc?rev=1427029&view=rev
Log:
One more fix for 
TOMEE-686 - JAX-RS @Context injection for EJB interceptors

Modified:
    
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java

Modified: 
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java?rev=1427029&r1=1427028&r2=1427029&view=diff
==============================================================================
--- 
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java
 (original)
+++ 
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java
 Mon Dec 31 00:50:53 2012
@@ -22,6 +22,7 @@ import org.apache.openejb.BeanContext;
 import org.apache.openejb.InvalidateReferenceException;
 import org.apache.openejb.rest.ThreadLocalContextManager;
 import org.apache.openejb.util.proxy.BeanContextInvocationHandler;
+import org.apache.openejb.util.proxy.LocalBeanProxyFactory;
 import org.apache.openejb.util.proxy.ProxyManager;
 
 import java.lang.reflect.InvocationHandler;
@@ -50,7 +51,8 @@ public class OpenEJBEJBInvoker extends J
     }
 
     private Set<Class<?>> getContextTypes(Object resourceObject) {
-        if (!ProxyManager.isProxyClass(resourceObject.getClass())) return null;
+        if (!ProxyManager.isProxyClass(resourceObject.getClass())
+                && !LocalBeanProxyFactory.isProxy(resourceObject.getClass())) 
return null;
         final InvocationHandler handler = 
ProxyManager.getInvocationHandler(resourceObject);
         if (!(handler instanceof BeanContextInvocationHandler)) return null;