Author: markt
Date: Thu May 9 20:18:50 2013
New Revision: 1480757
URL: http://svn.apache.org/r1480757
Log:
Refactoring to remove unnecessary SET_WRITE_LISTENER action
Modified:
tomcat/trunk/java/org/apache/coyote/ActionCode.java
tomcat/trunk/java/org/apache/coyote/Response.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
Modified: tomcat/trunk/java/org/apache/coyote/ActionCode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ActionCode.java?rev=1480757&r1=1480756&r2=1480757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ActionCode.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ActionCode.java Thu May 9 20:18:50 2013
@@ -201,11 +201,6 @@ public enum ActionCode {
UPGRADE,
/**
- * Callback to trigger setting the WriteListener
- */
- SET_WRITE_LISTENER,
-
- /**
* Indicator that Servlet is interested in being
* notified when data is available to be read
*/
Modified: tomcat/trunk/java/org/apache/coyote/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Response.java?rev=1480757&r1=1480756&r2=1480757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Response.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Response.java Thu May 9 20:18:50 2013
@@ -572,8 +572,5 @@ public final class Response {
}
this.listener = listener;
- action(ActionCode.SET_WRITE_LISTENER, null);
-
- this.listener = listener;
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1480757&r1=1480756&r2=1480757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Thu
May 9 20:18:50 2013
@@ -110,8 +110,8 @@ public abstract class AbstractOutputBuff
* the possible need to write HTTP headers, there may be more than one
write
* to the OutputBuffer.
*/
- protected volatile LinkedBlockingDeque<ByteBufferHolder> bufferedWrites =
- null;
+ protected final LinkedBlockingDeque<ByteBufferHolder> bufferedWrites =
+ new LinkedBlockingDeque<>();
/**
* The max size of the buffered write buffer
@@ -620,17 +620,6 @@ public abstract class AbstractOutputBuff
/**
- * Configure the blocking behaviour of the OutputBuffer.
- */
- public final void setBlocking(boolean blocking) {
- if (blocking)
- bufferedWrites = null;
- else
- bufferedWrites = new LinkedBlockingDeque<>();
- }
-
-
- /**
* Is standard Servlet blocking IO being used for output?
*/
protected final boolean isBlocking() {
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=1480757&r1=1480756&r2=1480757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu May
9 20:18:50 2013
@@ -520,8 +520,6 @@ public class Http11NioProcessor extends
if (asyncStateMachine.asyncDispatch()) {
((NioEndpoint)endpoint).dispatchForEvent(this.socket.getSocket(),SocketStatus.OPEN_READ,
true);
}
- } else if (actionCode == ActionCode.SET_WRITE_LISTENER) {
- outputBuffer.setBlocking(false);
}
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=1480757&r1=1480756&r2=1480757&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Thu
May 9 20:18:50 2013
@@ -95,8 +95,8 @@ public class InternalNioOutputBuffer ext
socket.getBufHandler().getWriteBuffer().clear();
socket = null;
}
- setBlocking(true);
flipped = false;
+ bufferedWrites.clear();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
