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 2016/10/18 14:35:33 UTC
svn commit: r1765447 - in /tomcat/trunk: java/org/apache/coyote/http2/
test/org/apache/coyote/http2/
Author: markt
Date: Tue Oct 18 14:35:33 2016
New Revision: 1765447
URL: http://svn.apache.org/viewvc?rev=1765447&view=rev
Log:
More consistent naming
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/trunk/java/org/apache/coyote/http2/StreamStateMachine.java
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1765447&r1=1765446&r2=1765447&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Tue Oct 18 14:35:33 2016
@@ -172,7 +172,7 @@ class Http2Parser {
swallow(streamId, padLength, true);
}
if (endOfStream) {
- output.receiveEndOfStream(streamId);
+ output.receivedEndOfStream(streamId);
}
} else {
synchronized (dest) {
@@ -183,7 +183,7 @@ class Http2Parser {
swallow(streamId, padLength, true);
}
if (endOfStream) {
- output.receiveEndOfStream(streamId);
+ output.receivedEndOfStream(streamId);
}
output.endRequestBodyFrame(streamId);
}
@@ -411,7 +411,7 @@ class Http2Parser {
output.headersEnd(streamId);
if (headersEndStream) {
- output.receiveEndOfStream(streamId);
+ output.receivedEndOfStream(streamId);
headersEndStream = false;
}
}
@@ -580,7 +580,7 @@ class Http2Parser {
// Data frames
ByteBuffer startRequestBodyFrame(int streamId, int payloadSize) throws Http2Exception;
void endRequestBodyFrame(int streamId) throws Http2Exception;
- void receiveEndOfStream(int streamId) throws ConnectionException;
+ void receivedEndOfStream(int streamId) throws ConnectionException;
void swallowedPadding(int streamId, int paddingLength) throws ConnectionException, IOException;
// Header frames
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1765447&r1=1765446&r2=1765447&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Tue Oct 18 14:35:33 2016
@@ -1167,7 +1167,7 @@ class Http2UpgradeHandler extends Abstra
@Override
- public void receiveEndOfStream(int streamId) throws ConnectionException {
+ public void receivedEndOfStream(int streamId) throws ConnectionException {
Stream stream = getStream(streamId, connectionState.get().isNewStreamAllowed());
if (stream != null) {
stream.receivedEndOfStream();
@@ -1247,7 +1247,7 @@ class Http2UpgradeHandler extends Abstra
setMaxProcessedStream(streamId);
Stream stream = getStream(streamId, connectionState.get().isNewStreamAllowed());
if (stream != null && stream.isActive()) {
- stream.headersEnd();
+ stream.receivedEndOfHeaders();
processStreamOnContainerThread(stream);
}
}
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=1765447&r1=1765446&r2=1765447&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Tue Oct 18 14:35:33 2016
@@ -125,7 +125,7 @@ class Stream extends AbstractStream impl
Long.toString(errorCode)));
}
// Set the new state first since read and write both check this
- state.receiveReset();
+ state.receivedReset();
// Reads wait internally so need to call a method to break the wait()
if (inputBuffer != null) {
inputBuffer.receiveReset();
@@ -251,7 +251,7 @@ class Stream extends AbstractStream impl
}
- final void headersEnd() {
+ final void receivedEndOfHeaders() {
// Cookie headers need to be concatenated into a single header
// See RFC 7540 8.1.2.5
// Can only do this once the headers are fully received
Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamStateMachine.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamStateMachine.java?rev=1765447&r1=1765446&r2=1765447&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamStateMachine.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamStateMachine.java Tue Oct 18 14:35:33 2016
@@ -71,7 +71,7 @@ class StreamStateMachine {
}
- final synchronized void receiveReset() {
+ final synchronized void receivedReset() {
stateChange(state, State.CLOSED_RST_RX);
}
Modified: tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java?rev=1765447&r1=1765446&r2=1765447&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Tue Oct 18 14:35:33 2016
@@ -824,7 +824,7 @@ public abstract class Http2TestBase exte
@Override
- public void receiveEndOfStream(int streamId) {
+ public void receivedEndOfStream(int streamId) {
lastStreamId = Integer.toString(streamId);
trace.append(lastStreamId + "-EndOfStream\n");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org