svn commit: r1816701 - in /tomcat/trunk/java/org/apache/coyote/http2: LocalStrings.properties Stream.java StreamProcessor.java

[markt]

Author: markt
Date: Thu Nov 30 10:20:33 2017
New Revision: 1816701

URL: http://svn.apache.org/viewvc?rev=1816701&view=rev
Log:
Refactoring: HTTP/1.1 - HTTP/2 alignment

Simply HTTP/2 flush code

Modified:
    tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
    tomcat/trunk/java/org/apache/coyote/http2/Stream.java
    tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1816701&r1=1816700&r2=1816701&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Thu Nov 
30 10:20:33 2017
@@ -90,7 +90,6 @@ stream.reset.fail=Connection [{0}], Stre
 stream.reset.receive=Connection [{0}], Stream [{1}], Reset received due to 
[{2}]
 stream.reset.send=Connection [{0}], Stream [{1}], Reset sent due to [{2}]
 stream.trailerHeader.noEndOfStream=Connection [{0}], Stream [{1}], The trailer 
headers did not include the end of stream flag
-stream.write=Connection [{0}], Stream [{1}]
 
 stream.inputBuffer.copy=Copying [{0}] bytes from inBuffer to outBuffer
 stream.inputBuffer.dispatch=Data added to inBuffer when read interest is 
registered. Triggering a read dispatch

Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1816701&r1=1816700&r2=1816701&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Thu Nov 30 10:20:33 
2017
@@ -448,14 +448,6 @@ class Stream extends AbstractStream impl
     }
 
 
-    final void flushData() throws IOException {
-        if (log.isDebugEnabled()) {
-            log.debug(sm.getString("stream.write", getConnectionId(), 
getIdentifier()));
-        }
-        outputBuffer.flush(true);
-    }
-
-
     @Override
     final String getConnectionId() {
         return handler.getConnectionId();
@@ -787,7 +779,7 @@ class Stream extends AbstractStream impl
         @Override
         public final void end() throws IOException {
             closed = true;
-            flushData();
+            flush(true);
             writeTrailers();
         }
 

Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1816701&r1=1816700&r2=1816701&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Thu Nov 30 
10:20:33 2017
@@ -177,7 +177,7 @@ class StreamProcessor extends AbstractPr
 
     @Override
     protected final void flush() throws IOException {
-        stream.flushData();
+        stream.getOutputBuffer().flush();
     }
 
 



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