Author: markt
Date: Fri Mar 25 11:20:50 2011
New Revision: 1085323
URL: http://svn.apache.org/viewvc?rev=1085323&view=rev
Log:
Remove call to System.exit() reported by Veracode and related code clean-up
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/RoleMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java?rev=1085323&r1=1085322&r2=1085323&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java Fri Mar 25
11:20:50 2011
@@ -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 BaseMode
/**
- * 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 =
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?rev=1085323&r1=1085322&r2=1085323&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Fri Mar 25
11:20:50 2011
@@ -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);
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java?rev=1085323&r1=1085322&r2=1085323&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
Fri Mar 25 11:20:50 2011
@@ -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 ext
/**
- * 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 =
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/RoleMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/RoleMBean.java?rev=1085323&r1=1085322&r2=1085323&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/RoleMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/RoleMBean.java Fri Mar 25
11:20:50 2011
@@ -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 BaseModel
/**
- * 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
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java?rev=1085323&r1=1085322&r2=1085323&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java Fri Mar 25
11:20:50 2011
@@ -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 BaseModel
/**
- * 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 =
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
