svn commit: r1163302 - in /cxf/branches/2.4.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java

[ay]

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;
         }
         
     }