svn commit: r795241 - in /tomcat/trunk/java/org/apache/catalina: connector/AsyncContextImpl.java core/StandardWrapperValve.java

[fhanik]

Author: fhanik
Date: Fri Jul 17 21:54:34 2009
New Revision: 795241

URL: http://svn.apache.org/viewvc?rev=795241&view=rev
Log:
Add notes

Modified:
    tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
    tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java?rev=795241&r1=795240&r2=795241&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java Fri 
Jul 17 21:54:34 2009
@@ -59,15 +59,12 @@
     @Override
     public void complete() {
         // TODO SERVLET3 - async
-        
         doInternalComplete(false);
-
     }
 
     @Override
     public void dispatch() {
         // TODO SERVLET3 - async
-
     }
 
     @Override
@@ -85,6 +82,8 @@
         Runnable run = new Runnable() {
             public void run() {
                 try {
+                    //piggy back on the request dispatcher to ensure that 
filters etc get called.
+                    //TODO SERVLET3 - async should this be include/forward or 
a new dispatch type
                     requestDispatcher.include(servletRequest, servletResponse);
                 }catch (Exception x) {
                     //log.error("Async.dispatch",x);
@@ -93,7 +92,7 @@
             }
         };
         this.dispatch = run;
-        request.coyoteRequest.action(ActionCode.ACTION_ASYNC_DISPATCH, run );
+        request.coyoteRequest.action(ActionCode.ACTION_ASYNC_DISPATCH, null );
     }
 
     @Override

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=795241&r1=795240&r2=795241&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java Fri 
Jul 17 21:54:34 2009
@@ -211,7 +211,8 @@
                     try {
                         SystemLogHandler.startCapture();
                         if (request.isAsyncStarted()) {
-                           
((AsyncContextImpl)request.getAsyncContext()).doInternalDispatch(); 
+                            //TODO SERVLET3 - async
+                            
((AsyncContextImpl)request.getAsyncContext()).doInternalDispatch(); 
                         } else if (comet) {
                             filterChain.doFilterEvent(request.getEvent());
                             request.setComet(true);
@@ -227,6 +228,7 @@
                     }
                 } else {
                     if (request.isAsyncStarted()) {
+                        //TODO SERVLET3 - async
                         
((AsyncContextImpl)request.getAsyncContext()).doInternalDispatch();
                     } else if (comet) {
                         request.setComet(true);



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