You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mi...@apache.org on 2011/09/01 11:37:45 UTC

svn commit: r1163969 - in /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat: TomcatManagerImpl.java connector/ConnectorGBean.java

Author: michaelfang
Date: Thu Sep  1 09:37:45 2011
New Revision: 1163969

URL: http://svn.apache.org/viewvc?rev=1163969&view=rev
Log:
GERONIMO-6041 Exception thrown when delete a connector via admin console

Modified:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java?rev=1163969&r1=1163968&r2=1163969&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java Thu Sep  1 09:37:45 2011
@@ -246,7 +246,7 @@ public class TomcatManagerImpl implement
     public void removeConnector(AbstractName connectorAbstractName) {
 
             try {
-                kernel.invoke(connectorAbstractName, "doStop");
+                //kernel.invoke(connectorAbstractName, "doStop");
                 String connectorName=(String)kernel.getGBeanData(connectorAbstractName).getAttribute("name");
                 tomcatServerConfigManager.removeConnector(connectorName);
                 kernel.unloadGBean(connectorAbstractName);

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java?rev=1163969&r1=1163968&r2=1163969&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java Thu Sep  1 09:37:45 2011
@@ -129,7 +129,7 @@ public abstract class ConnectorGBean ext
     }
 
     public void doFail() {
-        log.warn(name + " connector failed");
+        //log.warn(name + " connector failed");
         doStop();
     }