You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by vi...@apache.org on 2015/12/22 08:00:40 UTC
svn commit: r1721303 -
/tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
Author: violetagg
Date: Tue Dec 22 07:00:40 2015
New Revision: 1721303
URL: http://svn.apache.org/viewvc?rev=1721303&view=rev
Log:
MBeanUtils.createMBean cannot return NULL. The method will throw exception if the mbean cannot be created or registered.
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java?rev=1721303&r1=1721302&r2=1721303&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java Tue Dec 22 07:00:40 2015
@@ -177,9 +177,13 @@ public class GlobalResourcesLifecycleLis
log.debug("Creating UserDatabase MBeans for resource " + name);
log.debug("Database=" + database);
}
- if (MBeanUtils.createMBean(database) == null) {
- throw new IllegalArgumentException
+ try {
+ MBeanUtils.createMBean(database);
+ } catch(Exception e) {
+ IllegalArgumentException iae = new IllegalArgumentException
("Cannot create UserDatabase MBean for resource " + name);
+ iae.initCause(e);
+ throw iae;
}
// Create the MBeans for each defined Role
@@ -189,9 +193,13 @@ public class GlobalResourcesLifecycleLis
if (log.isDebugEnabled()) {
log.debug(" Creating Role MBean for role " + role);
}
- if (MBeanUtils.createMBean(role) == null) {
- throw new IllegalArgumentException
+ try {
+ MBeanUtils.createMBean(role);
+ } catch (Exception e) {
+ IllegalArgumentException iae = new IllegalArgumentException
("Cannot create Role MBean for role " + role);
+ iae.initCause(e);
+ throw iae;
}
}
@@ -202,9 +210,13 @@ public class GlobalResourcesLifecycleLis
if (log.isDebugEnabled()) {
log.debug(" Creating Group MBean for group " + group);
}
- if (MBeanUtils.createMBean(group) == null) {
- throw new IllegalArgumentException
+ try {
+ MBeanUtils.createMBean(group);
+ } catch (Exception e) {
+ IllegalArgumentException iae = new IllegalArgumentException
("Cannot create Group MBean for group " + group);
+ iae.initCause(e);
+ throw iae;
}
}
@@ -215,9 +227,13 @@ public class GlobalResourcesLifecycleLis
if (log.isDebugEnabled()) {
log.debug(" Creating User MBean for user " + user);
}
- if (MBeanUtils.createMBean(user) == null) {
- throw new IllegalArgumentException
+ try {
+ MBeanUtils.createMBean(user);
+ } catch (Exception e) {
+ IllegalArgumentException iae = new IllegalArgumentException
("Cannot create User MBean for user " + user);
+ iae.initCause(e);
+ throw iae;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org