Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7E14599D9 for ; Fri, 2 Mar 2012 15:59:11 +0000 (UTC) Received: (qmail 99549 invoked by uid 500); 2 Mar 2012 15:59:11 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 99508 invoked by uid 500); 2 Mar 2012 15:59:11 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 99501 invoked by uid 99); 2 Mar 2012 15:59:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2012 15:59:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2012 15:59:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 33E672388865; Fri, 2 Mar 2012 15:58:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1296265 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ Date: Fri, 02 Mar 2012 15:58:49 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120302155850.33E672388865@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Mar 2 15:58:49 2012 New Revision: 1296265 URL: http://svn.apache.org/viewvc?rev=1296265&view=rev Log: Merged revisions 1296030 via svn merge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes ........ r1296030 | dkulp | 2012-03-01 21:01:59 -0500 (Thu, 01 Mar 2012) | 17 lines Merged revisions 1292373 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ................ r1292373 | dkulp | 2012-02-22 11:14:52 -0500 (Wed, 22 Feb 2012) | 9 lines Merged revisions 1292368 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1292368 | dkulp | 2012-02-22 11:12:08 -0500 (Wed, 22 Feb 2012) | 2 lines [CXF-4129] Restore compatibility with in-jdk jaxb ........ ................ ........ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsClientCallback.java cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java?rev=1296265&r1=1296264&r2=1296265&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java (original) +++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java Fri Mar 2 15:58:49 2012 @@ -359,7 +359,7 @@ public class DispatchImpl implements checkError(); client.setExecutor(getClient().getEndpoint().getExecutor()); - ClientCallback callback = new JaxwsClientCallback(asyncHandler); + ClientCallback callback = new JaxwsClientCallback(asyncHandler, this); Response ret = new JaxwsResponseCallback(callback); try { Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java?rev=1296265&r1=1296264&r2=1296265&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java (original) +++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java Fri Mar 2 15:58:49 2012 @@ -248,7 +248,7 @@ public class JaxWsClientProxy extends or } else { handler = null; } - ClientCallback callback = new JaxwsClientCallback(handler); + ClientCallback callback = new JaxwsClientCallback(handler, this); Response ret = new JaxwsResponseCallback(callback); client.invoke(callback, oi, params); Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsClientCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsClientCallback.java?rev=1296265&r1=1296264&r2=1296265&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsClientCallback.java (original) +++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsClientCallback.java Fri Mar 2 15:58:49 2012 @@ -31,9 +31,11 @@ import org.apache.cxf.endpoint.ClientCal class JaxwsClientCallback extends ClientCallback { final AsyncHandler handler; + final Object proxy; - public JaxwsClientCallback(final AsyncHandler handler) { + public JaxwsClientCallback(final AsyncHandler handler, Object p) { this.handler = handler; + this.proxy = p; } public void handleResponse(Map ctx, Object[] res) { context = ctx; Modified: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java?rev=1296265&r1=1296264&r2=1296265&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java (original) +++ cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java Fri Mar 2 15:58:49 2012 @@ -383,6 +383,29 @@ public class ClientServerTest extends Ab throw (Exception)ex.getCause(); } } + + @Test + public void testAsyncDiscardProxy() throws Exception { + URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl"); + assertNotNull(wsdl); + + SOAPService service = new SOAPService(wsdl, serviceName); + + assertNotNull(service); + + Greeter greeter = service.getPort(portName, Greeter.class); + + assertNotNull(service); + updateAddressPort(greeter, PORT); + + Response r1 = greeter.greetMeLaterAsync(3000); + greeter = null; + service = null; + System.gc(); + System.gc(); + System.gc(); + assertEquals("Hello, finally!", r1.get().getResponseType()); + } @Test public void testAsyncPollingCall() throws Exception {