Author: dblevins Date: Sun Dec 30 22:48:34 2012 New Revision: 1427009 URL: http://svn.apache.org/viewvc?rev=1427009&view=rev Log: Fixed regression caused by 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=1427009&r1=1427008&r2=1427009&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 Sun Dec 30 22:48:34 2012 @@ -50,6 +50,7 @@ public class OpenEJBEJBInvoker extends J } private Set<Class<?>> getContextTypes(Object resourceObject) { + if (!ProxyManager.isProxyClass(resourceObject.getClass())) return null; final InvocationHandler handler = ProxyManager.getInvocationHandler(resourceObject); if (!(handler instanceof BeanContextInvocationHandler)) return null;