Author: markt
Date: Thu Jan 8 19:47:57 2015
New Revision: 1650366
URL: http://svn.apache.org/r1650366
Log:
Simplify
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java?rev=1650366&r1=1650365&r2=1650366&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java Thu Jan
8 19:47:57 2015
@@ -99,7 +99,7 @@ public class Http11Nio2Processor extends
((InternalNio2InputBuffer)
getInputBuffer()).registerReadInterest();
}
if (write) {
- ((Http11OutputBuffer<?>)
getOutputBuffer()).registerWriteInterest();
+ socketWrapper.registerWriteInterest();
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java?rev=1650366&r1=1650365&r2=1650366&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java Thu Jan
8 19:47:57 2015
@@ -589,11 +589,6 @@ public class Http11OutputBuffer<S> imple
//------------------------------------------------------ Non-blocking
writes
- protected void registerWriteInterest() {
- socketWrapper.registerWriteInterest();
- }
-
-
/**
* Writes any remaining buffered data.
*
@@ -618,7 +613,7 @@ public class Http11OutputBuffer<S> imple
protected final boolean isReady() {
boolean result = !hasDataToWrite();
if (!result) {
- registerWriteInterest();
+ socketWrapper.registerWriteInterest();
}
return result;
}
Modified:
tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java?rev=1650366&r1=1650365&r2=1650366&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java
Thu Jan 8 19:47:57 2015
@@ -80,12 +80,6 @@ public class TesterOutputBuffer extends
@Override
- protected void registerWriteInterest() {
- // NO-OP: Unused
- }
-
-
- @Override
protected boolean flushBuffer(boolean block) throws IOException {
// Blocking IO so ignore block parameter as this will always use
// blocking IO.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
