Remove call to System.exit() reported by Veracode and related code clean-up

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1085323 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/mbeans/GroupMBean.java b/java/org/apache/catalina/mbeans/GroupMBean.java
index ff50500..893572a 100644 (file)
--- a/java/org/apache/catalina/mbeans/GroupMBean.java
+++ b/java/org/apache/catalina/mbeans/GroupMBean.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 
 import javax.management.MBeanException;
-import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import javax.management.RuntimeOperationsException;
@@ -75,12 +74,6 @@ public class GroupMBean extends BaseModelMBean {
 
 
     /**
-     * The <code>MBeanServer</code> in which we are registered.
-     */
-    protected MBeanServer mserver = MBeanUtils.createServer();
-
-
-    /**
      * The <code>ManagedBean</code> information describing this MBean.
      */
     protected ManagedBean managed =

diff --git a/java/org/apache/catalina/mbeans/MBeanUtils.java b/java/org/apache/catalina/mbeans/MBeanUtils.java
index aa0f7aa..193ccc0 100644 (file)
--- a/java/org/apache/catalina/mbeans/MBeanUtils.java
+++ b/java/org/apache/catalina/mbeans/MBeanUtils.java
@@ -622,8 +622,7 @@ public class MBeanUtils {
      *
      * @exception MalformedObjectNameException if a name cannot be created
      */
-    static ObjectName createObjectName(String domain,
-            @SuppressWarnings("unused") Engine engine)
+    static ObjectName createObjectName(String domain, Engine engine)
         throws MalformedObjectNameException {
 
         ObjectName name = null;
@@ -785,8 +784,7 @@ public class MBeanUtils {
      *
      * @exception MalformedObjectNameException if a name cannot be created
      */
-    static ObjectName createObjectName(String domain,
-            @SuppressWarnings("unused") MBeanFactory factory)
+    static ObjectName createObjectName(String domain, MBeanFactory factory)
         throws MalformedObjectNameException {
 
         ObjectName name = new ObjectName(domain + ":type=MBeanFactory");
@@ -861,8 +859,7 @@ public class MBeanUtils {
      *
      * @exception MalformedObjectNameException if a name cannot be created
      */
-    static ObjectName createObjectName(String domain,
-            @SuppressWarnings("unused") Server server)
+    static ObjectName createObjectName(String domain, Server server)
         throws MalformedObjectNameException {
 
         ObjectName name = null;
@@ -1055,13 +1052,7 @@ public class MBeanUtils {
     public static synchronized MBeanServer createServer() {
 
         if (mserver == null) {
-            try {
-                mserver = Registry.getRegistry(null, null).getMBeanServer();
-            } catch (Throwable t) {
-                ExceptionUtils.handleThrowable(t);
-                t.printStackTrace(System.out);
-                System.exit(1);
-            }
+            mserver = Registry.getRegistry(null, null).getMBeanServer();
         }
         return (mserver);
 

diff --git a/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java b/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
index 454c3f3..33bc94f 100644 (file)
--- a/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
+++ b/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 
 import javax.management.MBeanException;
-import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import javax.management.RuntimeOperationsException;
@@ -76,12 +75,6 @@ public class MemoryUserDatabaseMBean extends BaseModelMBean {
 
 
     /**
-     * The <code>MBeanServer</code> in which we are registered.
-     */
-    protected MBeanServer mserver = MBeanUtils.createServer();
-
-
-    /**
      * The <code>ManagedBean</code> information describing this MBean.
      */
     protected ManagedBean managed =

diff --git a/java/org/apache/catalina/mbeans/RoleMBean.java b/java/org/apache/catalina/mbeans/RoleMBean.java
index d47031a..6e87419 100644 (file)
--- a/java/org/apache/catalina/mbeans/RoleMBean.java
+++ b/java/org/apache/catalina/mbeans/RoleMBean.java
@@ -19,7 +19,6 @@ package org.apache.catalina.mbeans;
 
 
 import javax.management.MBeanException;
-import javax.management.MBeanServer;
 import javax.management.RuntimeOperationsException;
 
 import org.apache.tomcat.util.modeler.BaseModelMBean;
@@ -68,16 +67,9 @@ public class RoleMBean extends BaseModelMBean {
 
 
     /**
-     * The <code>MBeanServer</code> in which we are registered.
-     */
-    protected MBeanServer mserver = MBeanUtils.createServer();
-
-
-    /**
      * The <code>ManagedBean</code> information describing this MBean.
      */
-    protected ManagedBean managed =
-        registry.findManagedBean("Role");
+    protected ManagedBean managed = registry.findManagedBean("Role");
 
 
     // ------------------------------------------------------------- Attributes

diff --git a/java/org/apache/catalina/mbeans/UserMBean.java b/java/org/apache/catalina/mbeans/UserMBean.java
index ce53281..c717e66 100644 (file)
--- a/java/org/apache/catalina/mbeans/UserMBean.java
+++ b/java/org/apache/catalina/mbeans/UserMBean.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 
 import javax.management.MBeanException;
-import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import javax.management.RuntimeOperationsException;
@@ -75,12 +74,6 @@ public class UserMBean extends BaseModelMBean {
 
 
     /**
-     * The <code>MBeanServer</code> in which we are registered.
-     */
-    protected MBeanServer mserver = MBeanUtils.createServer();
-
-
-    /**
      * The <code>ManagedBean</code> information describing this MBean.
      */
     protected ManagedBean managed =