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 A99228965 for ; Tue, 30 Aug 2011 17:33:02 +0000 (UTC) Received: (qmail 88811 invoked by uid 500); 30 Aug 2011 17:33:02 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 88697 invoked by uid 500); 30 Aug 2011 17:33:02 -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 88685 invoked by uid 99); 30 Aug 2011 17:33:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Aug 2011 17:33:01 +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, 30 Aug 2011 17:32:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 389CD2388A19 for ; Tue, 30 Aug 2011 17:32:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1163302 - in /cxf/branches/2.4.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java Date: Tue, 30 Aug 2011 17:32:38 -0000 To: commits@cxf.apache.org From: ay@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110830173238.389CD2388A19@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ay Date: Tue Aug 30 17:32:37 2011 New Revision: 1163302 URL: http://svn.apache.org/viewvc?rev=1163302&view=rev Log: Merged revisions 1163292 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1163292 | ay | 2011-08-30 19:06:23 +0200 (Tue, 30 Aug 2011) | 1 line [CXF-3773] CXF unregisters MBeans for JAX-WS endpoints twice ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ svn:mergeinfo = /cxf/trunk:1163292 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java?rev=1163302&r1=1163301&r2=1163302&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java (original) +++ cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java Tue Aug 30 17:32:37 2011 @@ -181,6 +181,7 @@ public class ServerImpl implements Serve } catch (JMException jmex) { LOG.log(Level.WARNING, "Unregistering ManagedEndpoint failed.", jmex); } + iMgr = null; } }