Author: pero
Date: Tue Jun 25 11:26:48 2013
New Revision: 1496421
URL: http://svn.apache.org/r1496421
Log:
Avoid Warning message at shutdown, if GlobalResourceLifecacleListener isn't
configured
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?rev=1496421&r1=1496420&r2=1496421&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Tue
Jun 25 11:26:48 2013
@@ -1618,7 +1618,9 @@ 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);
+ }
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1496421&r1=1496420&r2=1496421&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jun 25 11:26:48 2013
@@ -98,6 +98,10 @@
<code>java.beans.Introspector.flushCaches()</code> and
<code>sun.awt.AppContext.getAppContext()</code> in Java 7. (markt)
</fix>
+ <fix>
+ Avoid WARNING log message of
<code>Users:type=UserDatabase,database=UserDatabase</code>
+ at tomcat shutdown. (pero)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
