You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ji...@apache.org on 2011/09/16 19:13:48 UTC
svn commit: r1171679 - in /tomcat/tc5.5.x/trunk: ./
connectors/jk/java/org/apache/jk/server/
container/catalina/src/share/org/apache/catalina/connector/
container/webapps/docs/
Author: jim
Date: Fri Sep 16 17:13:48 2011
New Revision: 1171679
URL: http://svn.apache.org/viewvc?rev=1171679&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
https://issues.apache.org/bugzilla/attachment.cgi?id=27421
+1: markt, kkolinko, jim
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings_es.properties
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings_fr.properties
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings_ja.properties
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1171679&r1=1171678&r2=1171679&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Sep 16 17:13:48 2011
@@ -24,12 +24,6 @@ $Id$
PATCHES ACCEPTED TO BACKPORT FROM TRUNK/OTHER:
[ start all new proposals below, under PATCHES PROPOSED. ]
-* 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=27421
- +1: markt, kkolinko, jim
- -1:
-
* Align jpda settings with catalina.sh, tc6.0.x, tc7.0.x and trunk
http://people.apache.org/~markt/patches/2011-08-25-jpda-tc5.patch
+1: markt, kkolinko, jim
Modified: tomcat/tc5.5.x/trunk/connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java?rev=1171679&r1=1171678&r2=1171679&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java (original)
+++ tomcat/tc5.5.x/trunk/connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java Fri Sep 16 17:13:48 2011
@@ -198,8 +198,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/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java?rev=1171679&r1=1171678&r2=1171679&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java (original)
+++ tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java Fri Sep 16 17:13:48 2011
@@ -179,8 +179,6 @@ public class CoyoteAdapter
} 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/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties?rev=1171679&r1=1171678&r2=1171679&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties (original)
+++ tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties Fri Sep 16 17:13:48 2011
@@ -32,11 +32,6 @@ coyoteConnector.MapperRegistration=regis
coyoteConnector.protocolUnregistrationFailed=Protocol handler stop failed
#
-# CoyoteAdapter
-#
-coyoteAdapter.service=An exception or error occurred in the container during the request processing
-
-#
# CoyoteResponse
#
coyoteResponse.getOutputStream.ise=getWriter() has already been called for this response
Modified: tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings_es.properties
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings_es.properties?rev=1171679&r1=1171678&r2=1171679&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings_es.properties (original)
+++ tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings_es.properties Fri Sep 16 17:13:48 2011
@@ -29,12 +29,6 @@ coyoteConnector.protocolHandlerStartFail
coyoteConnector.protocolRegistrationFailed=Fall\u00f3 el registro de JMX
#
-# CoyoteAdapter
-#
-
-coyoteAdapter.service=Ha tenido lugar una excepci\u00f3n o error en el contenedor durante el procesamiento del requerimiento
-
-#
# CoyoteResponse
#
Modified: tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings_fr.properties
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings_fr.properties?rev=1171679&r1=1171678&r2=1171679&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings_fr.properties (original)
+++ tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings_fr.properties Fri Sep 16 17:13:48 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/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings_ja.properties
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings_ja.properties?rev=1171679&r1=1171678&r2=1171679&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings_ja.properties (original)
+++ tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings_ja.properties Fri Sep 16 17:13:48 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/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1171679&r1=1171678&r2=1171679&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Fri Sep 16 17:13:48 2011
@@ -43,6 +43,9 @@
<subsection name="General">
<changelog>
<fix>
+ <bug>51550</bug>: Display error page rather than an empty response for an IllegalStateException
+ </fix>
+ <fix>
<bug>33262</bug>: When using the Windows installer, the monitor is now
auto-started for the current user rather than all users to be consistent
with menu item creation. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org