You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2003/03/17 20:25:37 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session StandardManager.java
costin 2003/03/17 11:25:37
Modified: catalina/src/share/org/apache/catalina/session
StandardManager.java
Log:
Registration.
Less verbosity.
Revision Changes Path
1.7 +26 -16 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardManager.java
Index: StandardManager.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StandardManager.java 9 Jan 2003 19:09:33 -0000 1.6
+++ StandardManager.java 17 Mar 2003 19:25:37 -0000 1.7
@@ -85,6 +85,9 @@
import java.util.ArrayList;
import java.util.Iterator;
import javax.servlet.ServletContext;
+import javax.management.MBeanRegistration;
+import javax.management.ObjectName;
+import javax.management.MBeanServer;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
@@ -95,8 +98,11 @@
import org.apache.catalina.Loader;
import org.apache.catalina.Manager;
import org.apache.catalina.Session;
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.core.StandardHost;
import org.apache.catalina.util.CustomObjectInputStream;
import org.apache.catalina.util.LifecycleSupport;
+import org.apache.commons.modeler.Registry;
/**
@@ -116,7 +122,8 @@
public class StandardManager
extends ManagerBase
- implements Lifecycle, PropertyChangeListener, Runnable {
+ implements Lifecycle, PropertyChangeListener, Runnable
+ {
// ---------------------------------------------------- Security Classes
private class PrivilegedDoLoad
@@ -194,7 +201,6 @@
*/
private boolean started = false;
-
/**
* The background thread.
*/
@@ -469,8 +475,7 @@
classLoader = loader.getClassLoader();
if (classLoader != null) {
if (log.isDebugEnabled())
- log.debug("Creating custom object input stream for class loader "
- + classLoader);
+ log.debug("Creating custom object input stream for class loader ");
ois = new CustomObjectInputStream(bis, classLoader);
} else {
if (log.isDebugEnabled())
@@ -714,7 +719,6 @@
}
-
/**
* Prepare for the beginning of active use of the public methods of this
* component. This method should be called after <code>configure()</code>,
@@ -725,13 +729,14 @@
*/
public void start() throws LifecycleException {
- if (log.isDebugEnabled())
- log.debug("Starting");
-
+ if( ! initialized )
+ init();
+
// Validate and update our current component state
- if (started)
- throw new LifecycleException
- (sm.getString("standardManager.alreadyStarted"));
+ if (started) {
+ log.info(sm.getString("standardManager.alreadyStarted"));
+ return;
+ }
lifecycle.fireLifecycleEvent(START_EVENT, null);
started = true;
@@ -767,7 +772,7 @@
if (log.isDebugEnabled())
log.debug("Stopping");
-
+
// Validate and update our current component state
if (!started)
throw new LifecycleException
@@ -801,6 +806,9 @@
// Require a new random number generator if we are restarted
this.random = null;
+ if( initialized ) {
+ destroy();
+ }
}
@@ -965,4 +973,6 @@
}
}
+
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org