svn commit: r1496428 - /tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java

[pero]

Author: pero
Date: Tue Jun 25 11:40:27 2013
New Revision: 1496428

URL: http://svn.apache.org/r1496428
Log:
Avoid Warning message at shutdown, if GlobalResourceLifecacleListener isn't 
configured

Modified:
    tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java

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=1496428&r1=1496427&r2=1496428&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Tue Jun 25 
11:40:27 2013
@@ -787,6 +787,8 @@ public class MBeanUtils {
         // The database itself
         ObjectName db = new ObjectName(
                 "Users:type=UserDatabase,database=" + userDatabase);
-        mserver.unregisterMBean(db);
+        if( mserver.isRegistered(db) ) {
+            mserver.unregisterMBean(db);
+        }
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org