tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1044093 - /tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java
Date Thu, 09 Dec 2010 19:15:31 GMT
Author: markt
Date: Thu Dec  9 19:15:30 2010
New Revision: 1044093

URL: http://svn.apache.org/viewvc?rev=1044093&view=rev
Log:
mserver != null will never be true if the mbean was registered. Drop the check since the unregister
method will handle things correctly anyway

Modified:
    tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java?rev=1044093&r1=1044092&r2=1044093&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java Thu Dec  9 19:15:30 2010
@@ -418,10 +418,8 @@ public abstract class AbstractProtocolHa
                     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)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message