Author: dkulp Date: Tue Aug 30 19:44:03 2011 New Revision: 1163357 URL: http://svn.apache.org/viewvc?rev=1163357&view=rev Log: Merged revisions 1163302 via svnmerge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1163302 | ay | 2011-08-30 13:32:37 -0400 (Tue, 30 Aug 2011) | 9 lines 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.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java?rev=1163357&r1=1163356&r2=1163357&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java (original) +++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java Tue Aug 30 19:44:03 2011 @@ -181,6 +181,7 @@ public class ServerImpl implements Serve } catch (JMException jmex) { LOG.log(Level.WARNING, "Unregistering ManagedEndpoint failed.", jmex); } + iMgr = null; } }
