Author: markt
Date: Thu Apr 25 14:23:03 2013
New Revision: 1475792
URL: http://svn.apache.org/r1475792
Log:
Fix failing unit test now that a RuntimeException in an AsyncListener is caught
and logged.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1475791
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1475792&r1=1475791&r2=1475792&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Thu Apr 25 14:23:03 2013
@@ -460,15 +460,8 @@ public class TestAsyncContextImpl extend
expected.append("requestDestroyed");
} else if (completeOnTimeout.booleanValue()) {
expected.append("onTimeout-");
- if (dispatchUrl == null) {
- expected.append("onComplete-");
- expected.append("requestDestroyed");
- } else {
- // Error - no further output
- // There is no onComplete- since the complete event would be
- // fired during post processing but since there is an error
that
- // never happens.
- }
+ expected.append("onComplete-");
+ expected.append("requestDestroyed");
} else {
expected.append("onTimeout-");
if (dispatchUrl != null) {
@@ -487,11 +480,6 @@ public class TestAsyncContextImpl extend
alv.validateAccessLog(1, 500, TimeoutServlet.ASYNC_TIMEOUT,
TimeoutServlet.ASYNC_TIMEOUT + TIMEOUT_MARGIN +
REQUEST_TIME);
- } else if (completeOnTimeout.booleanValue() && dispatchUrl != null) {
- // This error is written into Host-level AccessLogValve only
- alvGlobal.validateAccessLog(1, 500, 0, TimeoutServlet.ASYNC_TIMEOUT
- + TIMEOUT_MARGIN + REQUEST_TIME);
- alv.validateAccessLog(0, 500, 0, 0);
} else {
alvGlobal.validateAccessLog(1, 200, TimeoutServlet.ASYNC_TIMEOUT,
TimeoutServlet.ASYNC_TIMEOUT + TIMEOUT_MARGIN +
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
