Author: markt
Date: Tue Nov 27 14:43:49 2007
New Revision: 598795

URL: http://svn.apache.org/viewvc?rev=598795&view=rev
Log:
Port rev 597738. Fix 43887 with some improved error messages.

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=598795&r1=598794&r2=598795&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov 27 14:43:49 2007
@@ -31,12 +31,6 @@
   +1: jfclere
   -1: fhanik - Can we add the 'package' directive to make the package match 
the dir structure
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43887
-  Include exception in log message
-  http://svn.apache.org/viewvc?rev=597738&view=rev
-  +1: markt, pero, remm
-  -1:
-
 * Remove conditional headers on Form Auth replay, since the UA (esp. FireFox) 
isn't expecting it.
   http://issues.apache.org/bugzilla/show_bug.cgi?id=43687
   +1: billbarker, remm

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=598795&r1=598794&r2=598795&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Tue 
Nov 27 14:43:49 2007
@@ -1787,7 +1787,7 @@
                 broadcaster.sendNotification(notification);
             }
         } catch( Exception ex ) {
-            log.info("Error registering servlet with jmx " + this);
+            log.info("Error registering servlet with jmx " + this, ex);
         }
 
         if (isJspServlet) {
@@ -1802,7 +1802,7 @@
                     .registerComponent(instance, jspMonitorON, null);
             } catch( Exception ex ) {
                 log.info("Error registering JSP monitoring with jmx " +
-                         instance);
+                         instance, ex);
             }
         }
     }

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=598795&r1=598794&r2=598795&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Nov 27 14:43:49 2007
@@ -61,6 +61,11 @@
         <bug>43675</bug>: Fix a possible logging related classloader leak. 
(markt)
       </fix>
       <fix>
+        <bug>43887</bug>: Make error messages much more helpful when illegal
+        Servlet names are used. Based on a patch provided by Mike Baranczak.
+        (markt)
+      </fix>
+      <fix>
         Fix a bug that causes CGI Servlet to fail when it is included. (markt)
       </fix>
       <update>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to