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 2015/06/05 21:05:59 UTC
svn commit: r1683846 - in /tomcat/trunk/java/org/apache/coyote/http2:
Http2UpgradeHandler.java Stream.java StreamStateMachine.java
Author: markt
Date: Fri Jun 5 19:05:59 2015
New Revision: 1683846
URL: http://svn.apache.org/r1683846
Log:
Rename
Modified:
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
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=1683846&r1=1683845&r2=1683846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Fri Jun 5 19:05:59 2015
@@ -423,7 +423,7 @@ public class Http2UpgradeHandler extends
header[3] = FrameType.DATA.getIdByte();
if (stream.getOutputBuffer().isFinished()) {
header[4] = FLAG_END_OF_STREAM;
- stream.sendEndOfStream();
+ stream.sentEndOfStream();
}
ByteUtil.set31Bits(header, 5, stream.getIdentifier().intValue());
socketWrapper.write(true, header, 0, header.length);
@@ -720,7 +720,7 @@ public class Http2UpgradeHandler extends
public void receiveEndOfStream(int streamId) {
Stream stream = getStream(streamId);
if (stream != null) {
- stream.receiveEndOfStream();
+ stream.receivedEndOfStream();
}
}
@@ -749,7 +749,7 @@ public class Http2UpgradeHandler extends
@Override
public void headersEnd(int streamId) {
Stream stream = getStream(streamId);
- stream.headersEnd();
+ stream.receivedEndOfHeaders();
// Process this stream on a container thread
StreamProcessor streamProcessor = new StreamProcessor(stream, adapter, socketWrapper);
streamProcessor.setSslSupport(sslSupport);
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=1683846&r1=1683845&r2=1683846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Fri Jun 5 19:05:59 2015
@@ -66,9 +66,9 @@ public class Stream extends AbstractStre
this.coyoteRequest = coyoteRequest;
this.inputBuffer = null;
// Headers have been populated by this point
- state.receiveHeaders();
+ state.receivedEndOfHeaders();
// TODO Assuming the body has been read at this point is not valid
- state.recieveEndOfStream();
+ state.recievedEndOfStream();
}
this.coyoteResponse.setOutputBuffer(outputBuffer);
this.coyoteRequest.setResponse(coyoteResponse);
@@ -235,18 +235,18 @@ public class Stream extends AbstractStre
}
- void headersEnd() {
- state.receiveHeaders();
+ void receivedEndOfHeaders() {
+ state.receivedEndOfHeaders();
}
- void receiveEndOfStream() {
- state.recieveEndOfStream();
+ void receivedEndOfStream() {
+ state.recievedEndOfStream();
}
- void sendEndOfStream() {
- state.sendEndOfStream();
+ void sentEndOfStream() {
+ state.sentEndOfStream();
}
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=1683846&r1=1683845&r2=1683846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamStateMachine.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamStateMachine.java Fri Jun 5 19:05:59 2015
@@ -48,35 +48,35 @@ public class StreamStateMachine {
}
- public synchronized void sendPushPromise() {
+ public synchronized void sentPushPromise() {
stateChange(State.IDLE, State.RESERVED_LOCAL);
}
- public synchronized void receivePushPromis() {
+ public synchronized void receivedPushPromis() {
stateChange(State.IDLE, State.RESERVED_REMOTE);
}
- public synchronized void sendHeaders() {
+ public synchronized void sentEndOfHeaders() {
stateChange(State.IDLE, State.OPEN);
stateChange(State.RESERVED_LOCAL, State.HALF_CLOSED_REMOTE);
}
- public synchronized void receiveHeaders() {
+ public synchronized void receivedEndOfHeaders() {
stateChange(State.IDLE, State.OPEN);
stateChange(State.RESERVED_REMOTE, State.HALF_CLOSED_LOCAL);
}
- public synchronized void sendEndOfStream() {
+ public synchronized void sentEndOfStream() {
stateChange(State.OPEN, State.HALF_CLOSED_LOCAL);
stateChange(State.HALF_CLOSED_REMOTE, State.CLOSED_TX);
}
- public synchronized void recieveEndOfStream() {
+ public synchronized void recievedEndOfStream() {
stateChange(State.OPEN, State.HALF_CLOSED_REMOTE);
stateChange(State.HALF_CLOSED_LOCAL, State.CLOSED_RX);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org