You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by fh...@apache.org on 2007/11/20 00:38:45 UTC

svn commit: r596489 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/StandardWrapperValve.java webapps/docs/changelog.xml

Author: fhanik
Date: Mon Nov 19 15:38:40 2007
New Revision: 596489

URL: http://svn.apache.org/viewvc?rev=596489&view=rev
Log:
Fix Comet bug when CometEvent.close called during begin event

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.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=596489&r1=596488&r2=596489&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Nov 19 15:38:40 2007
@@ -35,8 +35,3 @@
   http://people.apache.org/~jfclere/patches/test_cookies.patch
   +1: jfclere
   -1: fhanik - Can we add the 'package' directive to make the package match the dir structure
-  
-* Fix Comet bug, if servlet calls cometEvent.close() on the BEGIN event, the request still is marked as comet and ends up in a funky state
-  http://people.apache.org/~fhanik/patches/comet-begin-event-close.patch
-  +1: fhanik, markt, pero, jim
-  -1: 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=596489&r1=596488&r2=596489&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java Mon Nov 19 15:38:40 2007
@@ -227,8 +227,8 @@
                     }
                 } else {
                     if (comet) {
-                        filterChain.doFilterEvent(request.getEvent());
                         request.setComet(true);
+                        filterChain.doFilterEvent(request.getEvent());
                     } else {
                         filterChain.doFilter
                             (request.getRequest(), response.getResponse());

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=596489&r1=596488&r2=596489&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Nov 19 15:38:40 2007
@@ -35,6 +35,9 @@
 <section name="Tomcat 6.0.16 (remm)">
   <subsection name="General">
     <changelog>
+      <update>
+        Fix handling of CometEvent.close when called during BEGIN event (fhanik)
+      </update>
       <fix><bug>43846</bug>
         Fix block simulated read and writes causing timeouts.
         Add non blocking parsing of HTTP request headers.



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