Author: dkulp Date: Fri Sep 4 16:46:55 2009 New Revision: 811483 URL: http://svn.apache.org/viewvc?rev=811483&view=rev Log: Merged revisions 811477 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r811477 | dkulp | 2009-09-04 12:36:37 -0400 (Fri, 04 Sep 2009) | 10 lines Merged revisions 811467 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r811467 | dkulp | 2009-09-04 12:19:57 -0400 (Fri, 04 Sep 2009) | 2 lines [CXF-2398] Patch from Seumas applied to fix issues of closing the JCA proxies. ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java cxf/branches/2.1.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 4 16:46:55 2009 @@ -1,2 +1,2 @@ -/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803,795161-795162,796300-796301,796598,797449,797452-797453,797460,797463-797464,797521-797522,797584-797585,797645,797652,797701,797884,797886,798348-798350,798568,798574-798575,798577-798578,798586,798608,798655,798752,798942,799444,799449,799738,799740,800514-800516,801382-801384,803960,803962,803979,804005,805925-805927,805929,806606,806612,806617,806662,808478,808484,808491,808495,808505,808527,808533-808534,808536,808539,809693,809717,809748,809784,809787-809801,810203-810224,810231,810236,810509-810510,810515,810527,810970,811016,811045,811191,811398,811400,811402 -/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538,791753,791947,792261-792263,792684,792975,792985,794297,794396,794728,794778-794780,794892,795160,796022-796023,796593,796780,797194,797231-797233,797442,797505,797517,797581-797582,797640,797651,797699,797882-797883,798344-798346,798479,798533,798551,798557,798561-798562,798570,798573,798584,798654,798749,798929,799439,799448,799637,799724,799792,800453,800497,801380-801381,802892,803129,803689,804002,804276,805784,805907,805909,806020-806021,806405,806576,806603-806604,806631,806633,806922,807748,807807,808035,808069,808085,808731,809083,809162,809417-809626,809631,809663,809706,809738,809962,810349,810376,810513,810526,810927,811013,811148,811175,811183,81138 7 +/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803,795161-795162,796300-796301,796598,797449,797452-797453,797460,797463-797464,797521-797522,797584-797585,797645,797652,797701,797884,797886,798348-798350,798568,798574-798575,798577-798578,798586,798608,798655,798752,798942,799444,799449,799738,799740,800514-800516,801382-801384,803960,803962,803979,804005,805925-805927,805929,806606,806612,806617,806662,808478,808484,808491,808495,808505,808527,808533-808534,808536,808539,809693,809717,809748,809784,809787-809801,810203-810224,810231,810236,810509-810510,810515,810527,810970,811016,811045,811191,811398,811400,811402,811477 +/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538,791753,791947,792261-792263,792684,792975,792985,794297,794396,794728,794778-794780,794892,795160,796022-796023,796593,796780,797194,797231-797233,797442,797505,797517,797581-797582,797640,797651,797699,797882-797883,798344-798346,798479,798533,798551,798557,798561-798562,798570,798573,798584,798654,798749,798929,799439,799448,799637,799724,799792,800453,800497,801380-801381,802892,803129,803689,804002,804276,805784,805907,805909,806020-806021,806405,806576,806603-806604,806631,806633,806922,807748,807807,808035,808069,808085,808731,809083,809162,809417-809626,809631,809663,809706,809738,809962,810349,810376,810513,810526,810927,811013,811148,811175,811183,81138 7,811467 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java?rev=811483&r1=811482&r2=811483&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java (original) +++ cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java Fri Sep 4 16:46:55 2009 @@ -77,6 +77,7 @@ private boolean isClosed; private Bus bus; private Object associatedHandle; + private Object clientProxy; public ManagedConnectionImpl(ManagedConnectionFactoryImpl mcf, ConnectionRequestInfo connReqInfo, Subject subject) { @@ -115,6 +116,10 @@ if (LOG.isLoggable(Level.FINER)) { LOG.finer("destroy"); } + + Client client = ClientProxy.getClient(clientProxy); + client.destroy(); + handles.clear(); isClosed = false; bus = null; @@ -245,31 +250,33 @@ createClientProxy(spec), spec)); } - private Object createClientProxy(final CXFConnectionSpec spec) { - - validateConnectionSpec(spec); - ClientProxyFactoryBean factory = null; - - if (EndpointUtils.hasWebServiceAnnotation(spec.getServiceClass())) { - factory = new JaxWsProxyFactoryBean(); - } else { - factory = new ClientProxyFactoryBean(); - } - - factory.setBus(getBus(spec.getBusConfigURL())); - factory.setServiceClass(spec.getServiceClass()); - factory.getServiceFactory().setEndpointName(spec.getEndpointName()); - factory.getServiceFactory().setServiceName(spec.getServiceName()); - factory.getServiceFactory().setWsdlURL(spec.getWsdlURL()); - - if (spec.getAddress() != null) { - factory.setAddress(spec.getAddress()); + private synchronized Object createClientProxy(final CXFConnectionSpec spec) { + if (clientProxy == null) { + validateConnectionSpec(spec); + ClientProxyFactoryBean factory = null; + + if (EndpointUtils.hasWebServiceAnnotation(spec.getServiceClass())) { + factory = new JaxWsProxyFactoryBean(); + } else { + factory = new ClientProxyFactoryBean(); + } + + factory.setBus(getBus(spec.getBusConfigURL())); + factory.setServiceClass(spec.getServiceClass()); + factory.getServiceFactory().setEndpointName(spec.getEndpointName()); + factory.getServiceFactory().setServiceName(spec.getServiceName()); + factory.getServiceFactory().setWsdlURL(spec.getWsdlURL()); + + if (spec.getAddress() != null) { + factory.setAddress(spec.getAddress()); + } + + configureObject(spec.getEndpointName().toString() + ".jaxws-client.proxyFactory", factory); + + clientProxy = factory.create(); } - - configureObject(spec.getEndpointName().toString() + ".jaxws-client.proxyFactory", factory); - - return factory.create(); + return clientProxy; } private void validateConnectionSpec(CXFConnectionSpec spec) { @@ -405,11 +412,6 @@ event.setConnectionHandle(proxy); sendEvent(event); - ConnectionInvocationHandler ch = - (ConnectionInvocationHandler)Proxy.getInvocationHandler(proxy); - Client client = ClientProxy.getClient(ch.target); - client.destroy(); - return null; } } Modified: cxf/branches/2.1.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java?rev=811483&r1=811482&r2=811483&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java (original) +++ cxf/branches/2.1.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java Fri Sep 4 16:46:55 2009 @@ -21,6 +21,7 @@ import javax.security.auth.Subject; import javax.xml.namespace.QName; +import org.apache.cxf.BusFactory; import org.apache.hello_world_soap_http.Greeter; import org.easymock.classextension.EasyMock; import org.easymock.classextension.IMocksControl; @@ -39,6 +40,8 @@ */ @Test public void testHandleEqualsMethod() throws Exception { + BusFactory.setDefaultBus(null); + IMocksControl control = EasyMock.createNiceControl(); ManagedConnectionFactoryImpl mcf = control.createMock(ManagedConnectionFactoryImpl.class); Modified: cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java?rev=811483&r1=811482&r2=811483&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java (original) +++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java Fri Sep 4 16:46:55 2009 @@ -32,7 +32,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.jms.ConnectionFactory; import javax.jms.Destination; import javax.jms.JMSException; import javax.jms.MessageListener; @@ -50,7 +49,6 @@ import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.transport.AbstractConduit; import org.apache.cxf.ws.addressing.EndpointReferenceType; -import org.springframework.jms.connection.SingleConnectionFactory; import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.core.MessageCreator; import org.springframework.jms.listener.AbstractMessageListenerContainer; @@ -313,7 +311,7 @@ } } - public void close() { + public synchronized void close() { if (listener != null) { listener.unreg(); listener = null; @@ -324,12 +322,7 @@ if (allListener != null) { allListener.shutdown(); } - if (jmsConfig.getWrappedConnectionFactory() != null) { - ConnectionFactory f = jmsConfig.getWrappedConnectionFactory(); - if (f instanceof SingleConnectionFactory) { - ((SingleConnectionFactory)f).destroy(); - } - } + jmsConfig.destroyWrappedConnectionFactory(); LOG.log(Level.FINE, "JMSConduit closed "); } Modified: cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java?rev=811483&r1=811482&r2=811483&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java (original) +++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java Fri Sep 4 16:46:55 2009 @@ -435,6 +435,17 @@ public ConnectionFactory getWrappedConnectionFactory() { return wrappedConnectionFactory; } + + public synchronized void destroyWrappedConnectionFactory() { + if (wrappedConnectionFactory instanceof SingleConnectionFactory) { + ((SingleConnectionFactory)wrappedConnectionFactory).destroy(); + if (connectionFactory == wrappedConnectionFactory) { + connectionFactory = null; + } + wrappedConnectionFactory = null; + } + } + /** * Only for tests * @return
