tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1003581 - in /tomcat/trunk: java/org/apache/catalina/core/StandardServer.java webapps/docs/changelog.xml
Date Fri, 01 Oct 2010 16:49:29 GMT
Author: markt
Date: Fri Oct  1 16:49:29 2010
New Revision: 1003581

URL: http://svn.apache.org/viewvc?rev=1003581&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49915
Make error more obvious, particularly when accessed via JConsole, if StandardServer.storeConfig()
is called when there is no StoreConfig implementation present.

Modified:
    tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardServer.java?rev=1003581&r1=1003580&r2=1003581&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Fri Oct  1 16:49:29 2010
@@ -584,27 +584,17 @@ public final class StandardServer extend
      * Write the configuration information for this entire <code>Server</code>
      * out to the server.xml configuration file.
      *
-     * @exception javax.management.InstanceNotFoundException if the managed resource object
-     *  cannot be found
-     * @exception javax.management.MBeanException if the initializer of the object throws
-     *  an exception, or persistence is not supported
-     * @exception javax.management.RuntimeOperationsException if an exception is reported
-     *  by the persistence mechanism
+     * @exception   javax.management.InstanceNotFoundException
+     *              if the managed resource object cannot be found
+     * @exception   javax.management.MBeanException
+     *              if the initializer of the object throws an exception, or
+     *              persistence is not supported
+     * @exception   javax.management.RuntimeOperationsException
+     *              if an exception is reported by the persistence mechanism
      */
     public synchronized void storeConfig() throws Exception {
-
-        ObjectName sname = null;    
-        try {
-           sname = new ObjectName("Catalina:type=StoreConfig");
-           if(mserver.isRegistered(sname)) {
-               mserver.invoke(sname, "storeConfig", null, null);            
-           } else
-               log.error("StoreConfig mbean not registered" + sname);
-        } catch (Throwable t) {
-            ExceptionUtils.handleThrowable(t);
-            log.error(t);
-        }
-
+        ObjectName sname = new ObjectName("Catalina:type=StoreConfig");
+        mserver.invoke(sname, "storeConfig", null, null);            
     }
 
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1003581&r1=1003580&r2=1003581&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Oct  1 16:49:29 2010
@@ -187,6 +187,11 @@
         <bug>47950</bug> that prevented JSTL classes being loaded. (markt)
       </fix>
       <fix>
+        <bug>49915</bug>: Make error more obvious, particularly when accessed
+        via JConsole, if StandardServer.storeConfig() is called when there is
+        no StoreConfig implementation present. (markt)
+      </fix>
+      <fix>
         <bug>50018</bug>: Fix some minor Javadoc errors in Jasper source.
         Based on a patch by sebb. (timw)
       </fix>



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


Mime
View raw message