Author: markt
Date: Sun May 24 17:48:27 2009
New Revision: 778198
URL: http://svn.apache.org/viewvc?rev=778198&view=rev
Log:
Yet more ServerFactory removal. Make exception handling consistent.
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java?rev=778198&r1=778197&r2=778198&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
Sun May 24 17:48:27 2009
@@ -36,7 +36,6 @@
import org.apache.catalina.Manager;
import org.apache.catalina.Realm;
import org.apache.catalina.Server;
-import org.apache.catalina.ServerFactory;
import org.apache.catalina.Service;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.core.StandardContext;
@@ -125,22 +124,34 @@
Lifecycle lifecycle = event.getLifecycle();
if (Lifecycle.START_EVENT.equals(event.getType())) {
- if (lifecycle instanceof Server) {
- createMBeans();
- }
+ try {
- // We are embedded.
- if( lifecycle instanceof Service ) {
- try {
+ if (lifecycle instanceof Server) {
+ MBeanFactory factory = new MBeanFactory();
+ createMBeans(factory);
+ createMBeans((Server) lifecycle);
+ }
+
+ if( lifecycle instanceof Service ) {
MBeanFactory factory = new MBeanFactory();
createMBeans(factory);
createMBeans((Service)lifecycle);
- } catch( Exception ex ) {
- log.error("Create mbean factory");
}
+
+ } catch (MBeanException t) {
+
+ Exception e = t.getTargetException();
+ if (e == null)
+ e = t;
+ log.error("createMBeans: MBeanException", e);
+
+ } catch (Throwable t) {
+
+ log.error("createMBeans: Throwable", t);
+
}
- /*
+ /*
// Ignore events from StandardContext objects to avoid
// reregistering the context
if (lifecycle instanceof StandardContext)
@@ -257,33 +268,6 @@
/**
- * Create the MBeans that correspond to every existing node of our tree.
- */
- protected void createMBeans() {
-
- try {
-
- MBeanFactory factory = new MBeanFactory();
- createMBeans(factory);
- createMBeans(ServerFactory.getServer());
-
- } catch (MBeanException t) {
-
- Exception e = t.getTargetException();
- if (e == null)
- e = t;
- log.error("createMBeans: MBeanException", e);
-
- } catch (Throwable t) {
-
- log.error("createMBeans: Throwable", t);
-
- }
-
- }
-
-
- /**
* Create the MBeans for the specified Connector and its nested components.
*
* @param connector Connector for which to create MBeans
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
