tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r940307 - /tomcat/trunk/java/org/apache/catalina/connector/Connector.java
Date Sun, 02 May 2010 19:17:52 GMT
Author: markt
Date: Sun May  2 19:17:52 2010
New Revision: 940307

URL: http://svn.apache.org/viewvc?rev=940307&view=rev
Log:
Clean-up prior to MBean changes

Modified:
    tomcat/trunk/java/org/apache/catalina/connector/Connector.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=940307&r1=940306&r2=940307&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Sun May  2 19:17:52 2010
@@ -855,8 +855,7 @@ public class Connector extends Lifecycle
     /**
      * Pause the connector.
      */
-    public void pause()
-        throws LifecycleException {
+    public void pause() {
         try {
             protocolHandler.pause();
         } catch (Exception e) {
@@ -869,8 +868,7 @@ public class Connector extends Lifecycle
     /**
      * Pause the connector.
      */
-    public void resume()
-        throws LifecycleException {
+    public void resume() {
         try {
             protocolHandler.resume();
         } catch (Exception e) {
@@ -990,15 +988,6 @@ public class Connector extends Lifecycle
     protected String domain;
     protected ObjectName oname;
     protected MBeanServer mserver;
-    ObjectName controller;
-
-    public ObjectName getController() {
-        return controller;
-    }
-
-    public void setController(ObjectName controller) {
-        this.controller = controller;
-    }
 
     public ObjectName getObjectName() {
         return oname;
@@ -1017,9 +1006,11 @@ public class Connector extends Lifecycle
     }
 
     public void postRegister(Boolean registrationDone) {
+        // NOOP
     }
 
     public void preDeregister() throws Exception {
+        // NOOP
     }
 
     public void postDeregister() {
@@ -1081,7 +1072,6 @@ public class Connector extends Lifecycle
                 oname = createObjectName(container.getName(), "Connector");
                 Registry.getRegistry(null, null)
                     .registerComponent(this, oname, null);
-                controller=oname;
             } catch (Exception e) {
                 log.error( "Error registering connector ", e);
             }
@@ -1108,7 +1098,7 @@ public class Connector extends Lifecycle
 
     @Override
     protected void destroyInternal() {
-        if( oname!=null && controller==oname ) {
+        if (oname!=null) {
             if(log.isDebugEnabled())
                  log.debug("Unregister itself " + oname );
             Registry.getRegistry(null, null).unregisterComponent(oname);



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


Mime
View raw message