svn commit: r1372153 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/core/TestAsyncContextImpl.java

[markt]

Author: markt
Date: Sun Aug 12 17:34:13 2012
New Revision: 1372153

URL: http://svn.apache.org/viewvc?rev=1372153&view=rev
Log:
Add additional check on current behaviour to try and catch any regressions in 
the fix for 53623

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:r1372152

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=1372153&r1=1372152&r2=1372153&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 
Sun Aug 12 17:34:13 2012
@@ -28,6 +28,7 @@ import java.util.concurrent.Executors;
 import javax.servlet.AsyncContext;
 import javax.servlet.AsyncEvent;
 import javax.servlet.AsyncListener;
+import javax.servlet.DispatcherType;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequestEvent;
@@ -597,6 +598,7 @@ public class TestAsyncContextImpl extend
 
         private static final long serialVersionUID = 1L;
         private static final String ITER_PARAM = "iter";
+        private static final String DISPATCH_CHECK = "check";
         private boolean addTrackingListener = false;
         private boolean completeOnError = false;
 
@@ -610,6 +612,11 @@ public class TestAsyncContextImpl extend
         protected void doGet(HttpServletRequest req, HttpServletResponse resp)
                 throws ServletException, IOException {
 
+            if ("y".equals(req.getParameter(DISPATCH_CHECK))) {
+                if (req.getDispatcherType() != DispatcherType.ASYNC) {
+                    resp.getWriter().write("WrongDispatcherType-");
+                }
+            }
             resp.getWriter().write("DispatchingServletGet-");
             resp.flushBuffer();
             final int iter = Integer.parseInt(req.getParameter(ITER_PARAM)) - 
1;
@@ -623,7 +630,8 @@ public class TestAsyncContextImpl extend
                 @Override
                 public void run() {
                     if (iter > 0) {
-                        ctxt.dispatch("/stage1?" + ITER_PARAM + "=" + iter);
+                        ctxt.dispatch("/stage1?" + ITER_PARAM + "=" + iter +
+                                "&" + DISPATCH_CHECK + "=y");
                     } else {
                         ctxt.dispatch("/stage2");
                     }



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