tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1173575 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/jk/server/ webapps/docs/
Date Wed, 21 Sep 2011 11:32:51 GMT
Author: markt
Date: Wed Sep 21 11:32:50 2011
New Revision: 1173575

URL: http://svn.apache.org/viewvc?rev=1173575&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51550
Display error page rather than an empty response for an IllegalStateException

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties
    tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkCoyoteHandler.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=1173575&r1=1173574&r2=1173575&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 21 11:32:50 2011
@@ -69,12 +69,6 @@ PATCHES PROPOSED TO BACKPORT:
       - getStuckThreadIds() returns a list of ids. It might be useful to
         have a similar method that returns Thread.getName() names.
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51550
-  Display error page rather than an empty response for an IllegalStateException
-  https://issues.apache.org/bugzilla/attachment.cgi?id=27434
-  +1: markt, kkolinko, fhanik
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51758
   Correct logger names used by Tomcat-internal copy of Commons Digester
   It is backport of r1164567, r1167394.

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1173575&r1=1173574&r2=1173575&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Wed Sep 21
11:32:50 2011
@@ -318,8 +318,6 @@ public class CoyoteAdapter implements Ad
 
         } catch (IOException e) {
             ;
-        } catch (Throwable t) {
-            log.error(sm.getString("coyoteAdapter.service"), t);
         } finally {
             req.getRequestProcessor().setWorkerThreadName(null);
             // Recycle the wrapper request and response

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1173575&r1=1173574&r2=1173575&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties Wed Sep
21 11:32:50 2011
@@ -34,7 +34,6 @@ coyoteConnector.protocolUnregistrationFa
 #
 # CoyoteAdapter
 #
-coyoteAdapter.service=An exception or error occurred in the container during the request
processing
 coyoteAdapter.read=The servlet did not read all available bytes during the processing of
the read event
 coyoteAdapter.parseSession=Unable to parse the session ID using encoding [{0}]. The session
ID in the URL will be ignored.
 coyoteAdapter.parsePathParam=Unable to parse the path parameters using encoding [{0}]. The
path parameters in the URL will be ignored.

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties?rev=1173575&r1=1173574&r2=1173575&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties Wed
Sep 21 11:32:50 2011
@@ -29,7 +29,6 @@ coyoteConnector.MapperRegistration = Map
 coyoteConnector.protocolUnregistrationFailed = Ha fallado la parada del manejador de protocolo
 #
 # CoyoteAdapter
-coyoteAdapter.service = Ha tenido lugar una excepci\u00F3n o error en el contenedor durante
el procesamiento del requerimiento
 coyoteAdapter.read = El servlet no ley\u00F3 todos los bytes disponibles durante el procesamiento
del evento de lectura
 #
 # CoyoteResponse

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties?rev=1173575&r1=1173574&r2=1173575&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties Wed
Sep 21 11:32:50 2011
@@ -31,12 +31,6 @@ coyoteConnector.protocolHandlerPauseFail
 coyoteConnector.protocolHandlerResumeFailed=Le red\u00e9marrage du gestionnaire de protocole
a \u00e9chou\u00e9
 
 #
-# CoyoteAdapter
-#
-
-coyoteAdapter.service=Une exception ou une erreur s''est produite dans le conteneur durant
le traitement de la requ\u00eate
-
-#
 # CoyoteResponse
 #
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties?rev=1173575&r1=1173574&r2=1173575&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties Wed
Sep 21 11:32:50 2011
@@ -31,12 +31,6 @@ coyoteConnector.protocolHandlerPauseFail
 coyoteConnector.protocolHandlerResumeFailed=\u30d7\u30ed\u30c8\u30b3\u30eb\u30cf\u30f3\u30c9\u30e9\u306e\u518d\u958b\u306b\u5931\u6557\u3057\u307e\u3057\u305f
 
 #
-# CoyoteAdapter
-#
-
-coyoteAdapter.service=\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u51e6\u7406\u4e2d\u306b\u30b3\u30cd\u30af\u30bf\u3067\u4f8b\u5916\u307e\u305f\u306f\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-
-#
 # CoyoteResponse
 #
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkCoyoteHandler.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkCoyoteHandler.java?rev=1173575&r1=1173574&r2=1173575&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkCoyoteHandler.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkCoyoteHandler.java Wed Sep 21 11:32:50
2011
@@ -188,8 +188,9 @@ public class JkCoyoteHandler extends JkH
         rp.setStage(Constants.STAGE_SERVICE);
         try {
             adapter.service( req, res );
-        } catch( Exception ex ) {
-            log.info("Error servicing request " + req,ex);
+        } catch( Throwable t ) {
+            ep.setStatus(MsgContext.JK_STATUS_ERROR);
+            log.info("Error servicing request " + req,t);
         }
         if(ep.getStatus() != MsgContext.JK_STATUS_CLOSED) {
             res.finish();

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=1173575&r1=1173574&r2=1173575&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Sep 21 11:32:50 2011
@@ -47,6 +47,10 @@
   <subsection name="Catalina">
     <changelog>
       <fix>
+        <bug>51550</bug>: Display an error page rather than an empty response
+        for an IllegalStateException caused by too many active sessions. (markt)
+      </fix>
+      <fix>
         <bug>51688</bug>: JreMemoryLeakPreventionListener now protects against
         AWT thread creation. (schultz)
       </fix>



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


Mime
View raw message