Author: ningjiang Date: Fri Sep 26 19:41:16 2008 New Revision: 699545 URL: http://svn.apache.org/viewvc?rev=699545&view=rev Log: Merged revisions 699542 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r699542 | ningjiang | 2008-09-27 10:16:00 +0800 (Sat, 27 Sep 2008) | 9 lines Merged revisions 699540 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r699540 | ningjiang | 2008-09-27 10:03:10 +0800 (Sat, 27 Sep 2008) | 1 line CXF-1825 applied patch with thanks to William ........ ................ Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java?rev=699545&r1=699544&r2=699545&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java (original) +++ cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java Fri Sep 26 19:41:16 2008 @@ -30,6 +30,7 @@ import javax.resource.spi.ManagedConnectionMetaData; import javax.security.auth.Subject; import javax.transaction.xa.XAResource; +import javax.xml.ws.BindingProvider; import javax.xml.ws.WebServiceException; import org.apache.cxf.Bus; @@ -191,12 +192,12 @@ private Object createConnectionProxy(Object obj, CXFConnectionRequestInfo cri, Subject subject) throws ResourceException { - Class classes[] = {Connection.class, cri.getInterface()}; + Class classes[] = {Connection.class, BindingProvider.class, cri.getInterface()}; return Proxy.newProxyInstance(cri.getInterface().getClassLoader(), classes, createInvocationHandler(obj, subject)); } - + private InvocationHandler createInvocationHandler(Object obj, Subject subject) throws ResourceException { return getHandlerFactory().createHandlers(obj, subject);
