Author: markt
Date: Wed Aug 15 22:56:05 2012
New Revision: 1373667
URL: http://svn.apache.org/viewvc?rev=1373667&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53697
Fix a regression in the fix for BZ 51881 that mean that in some circumstances
the isComet flag was not reset on the HttpAprProcessor. This caused problems
when the Processor was re-used for a new connection.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1373666
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1373667&r1=1373666&r2=1373667&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Wed Aug 15 22:56:05 2012
@@ -1681,6 +1681,7 @@ public abstract class AbstractHttp11Proc
localName = null;
remotePort = -1;
localPort = -1;
+ comet = false;
recycleInternal();
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1373667&r1=1373666&r2=1373667&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Wed Aug 15 22:56:05 2012
@@ -294,7 +294,6 @@ public class Http11NioProcessor extends
@Override
public void recycleInternal() {
socket = null;
- comet = false;
sendfileData = null;
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1373667&r1=1373666&r2=1373667&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Aug 15 22:56:05 2012
@@ -161,6 +161,14 @@
Prevent possible NPE when processing Comet requests during Connector
shutdown. (markt)
</fix>
+ <fix>
+ <bug>53697</bug>: Correct a regression in the fix for <bug>51881</bug>
+ that mean that in some circumstances the <code>comet</code> flag was
not
+ reset on <code>HttpAprProcessor</code> instances. This caused problems
+ when the Processor was re-used for a new connection that would trigger
a
+ <code>NullPointerException</code> and could result in a JVM crash.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
