tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1519501 - /tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
Date Mon, 02 Sep 2013 19:23:50 GMT
Author: markt
Date: Mon Sep  2 19:23:49 2013
New Revision: 1519501

URL: http://svn.apache.org/r1519501
Log:
Prevent NPE if dispatch results in a nested call to process()

Modified:
    tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1519501&r1=1519500&r2=1519501&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Sep  2 19:23:49 2013
@@ -618,6 +618,9 @@ public abstract class AbstractProtocol i
                 SocketState state = SocketState.CLOSED;
                 do {
                     if (wrapper.hasNextDispatch()) {
+                        // Associate with the processor with the connection as
+                        // these calls may result in a nested call to process()
+                        connections.put(socket, processor);
                         DispatchType nextDispatch = wrapper.getNextDispatch();
                         state = processor.asyncDispatch(
                                 nextDispatch.getSocketStatus());



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


Mime
View raw message