Author: markt
Date: Wed May 1 14:57:11 2013
New Revision: 1478037
URL: http://svn.apache.org/r1478037
Log:
Pull up NB_WRITE_INTEREST
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1478037&r1=1478036&r2=1478037&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Wed
May 1 14:57:11 2013
@@ -803,6 +803,9 @@ public abstract class AbstractHttp11Proc
((AtomicBoolean) param).set(asyncStateMachine.isAsyncTimingOut());
} else if (actionCode == ActionCode.ASYNC_IS_ERROR) {
((AtomicBoolean) param).set(asyncStateMachine.isAsyncError());
+ } else if (actionCode == ActionCode.NB_WRITE_INTEREST) {
+ AtomicBoolean isReady = (AtomicBoolean)param;
+ isReady.set(getOutputBuffer().isReady());
} else if (actionCode == ActionCode.UPGRADE) {
httpUpgradeHandler = (HttpUpgradeHandler) param;
// Stop further HTTP output
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1478037&r1=1478036&r2=1478037&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Wed May
1 14:57:11 2013
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.io.InterruptedIOException;
import java.net.InetAddress;
import java.nio.channels.SelectionKey;
-import java.util.concurrent.atomic.AtomicBoolean;
import javax.net.ssl.SSLEngine;
import javax.servlet.RequestDispatcher;
@@ -604,16 +603,6 @@ public class Http11NioProcessor extends
} else {
throw new IllegalStateException("Calling isReady
asynchronously is illegal.");
}
- } else if (actionCode == ActionCode.NB_WRITE_INTEREST) {
- if (socket==null || socket.getSocket().getAttachment(false)==null)
{
- return;
- }
- AtomicBoolean isReady = (AtomicBoolean)param;
- if (outputBuffer.isReady()) {
- isReady.set(true);
- } else {
- isReady.set(false);
- }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
