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 8C92A6FFD for ; Tue, 2 Aug 2011 17:12:39 +0000 (UTC) Received: (qmail 80371 invoked by uid 500); 2 Aug 2011 17:12:39 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 80079 invoked by uid 500); 2 Aug 2011 17:12:38 -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 79970 invoked by uid 99); 2 Aug 2011 17:12:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Aug 2011 17:12:38 +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; Tue, 02 Aug 2011 17:12:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6A279238896F for ; Tue, 2 Aug 2011 17:12:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1153204 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java Date: Tue, 02 Aug 2011 17:12:17 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110802171217.6A279238896F@eris.apache.org> 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(); }