You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/01/09 19:33:08 UTC
svn commit: r1650623 - in /tomcat/trunk/java/org/apache/coyote:
ajp/AjpProcessor.java http11/upgrade/UpgradeServletOutputStream.java
Author: markt
Date: Fri Jan 9 18:33:08 2015
New Revision: 1650623
URL: http://svn.apache.org/r1650623
Log:
Further review of socketWrapper.isReadyForWrite()
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1650623&r1=1650622&r2=1650623&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Fri Jan 9 18:33:08 2015
@@ -588,11 +588,8 @@ public class AjpProcessor<S> extends Abs
}
case NB_WRITE_INTEREST: {
AtomicBoolean isReady = (AtomicBoolean)param;
- boolean result = socketWrapper.isReadyForWrite() && responseMsgPos == -1;
+ boolean result = responseMsgPos == -1 && socketWrapper.isReadyForWrite();
isReady.set(result);
- if (!result) {
- registerForEvent(false, true);
- }
break;
}
case REQUEST_BODY_FULLY_READ: {
Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java?rev=1650623&r1=1650622&r2=1650623&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java Fri Jan 9 18:33:08 2015
@@ -169,7 +169,7 @@ public class UpgradeServletOutputStream
// should fire
boolean fire = false;
synchronized (fireListenerLock) {
- if (socketWrapper.isReadyForWrite() && fireListener) {
+ if (fireListener && socketWrapper.isReadyForWrite()) {
fireListener = false;
fire = true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org