Author: dkulp Date: Tue Aug 2 17:12:16 2011 New Revision: 1153204 URL: http://svn.apache.org/viewvc?rev=1153204&view=rev Log: Merged revisions 1153130 via svnmerge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1153130 | dkulp | 2011-08-02 09:56:29 -0400 (Tue, 02 Aug 2011) | 10 lines Merged revisions 1153128 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1153128 | dkulp | 2011-08-02 09:51:34 -0400 (Tue, 02 Aug 2011) | 1 line [CXF-3697] Make sure gc'd clients have the lifecycle methods called. Patch from Xilai Dai applied ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java?rev=1153204&r1=1153203&r2=1153204&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java (original) +++ cxf/branches/2.3.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java Tue Aug 2 17:12:16 2011 @@ -89,6 +89,12 @@ public class ClientProxy implements Invo return client; } + @Override + protected void finalize() throws Throwable { + client.destroy(); + super.finalize(); + } + public static Client getClient(Object o) { return ((ClientProxy)Proxy.getInvocationHandler(o)).getClient(); }
