From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 9 Dec 2010 19:15:30 +0000 (+0000)
Subject: mserver != null will never be true if the mbean was registered. Drop the check since... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d0fceaf1b43ba19dcabebc4df2e4a2c365fb420b;p=tomcat7.0

mserver != null will never be true if the mbean was registered. Drop the check since the unregister method will handle things correctly anyway

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1044093 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/coyote/AbstractProtocolHandler.java b/java/org/apache/coyote/AbstractProtocolHandler.java
index a851e3851..14bed600a 100644
--- a/java/org/apache/coyote/AbstractProtocolHandler.java
+++ b/java/org/apache/coyote/AbstractProtocolHandler.java
@@ -418,10 +418,8 @@ public abstract class AbstractProtocolHandler implements ProtocolHandler,
                     getName()), e);
         }
         
-        // If object was pre-registered (mserver != null) what ever registered
-        // the ProtocolHandler should de-register it
-        if (oname != null && mserver == null) {
-                Registry.getRegistry(null, null).unregisterComponent(oname);
+        if (oname != null) {
+            Registry.getRegistry(null, null).unregisterComponent(oname);
         }
 
         if (tpOname != null)