Author: markt
Date: Tue Oct 13 16:37:11 2015
New Revision: 1708463
URL: http://svn.apache.org/viewvc?rev=1708463&view=rev
Log:
Rename closeStream() -> resetStream()
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/Stream.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=1708463&r1=1708462&r2=1708463&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Tue Oct
13 16:37:11 2015
@@ -280,7 +280,7 @@ public class Http2UpgradeHandler extends
} catch (StreamException se) {
// Stream errors are not fatal to the connection so
// continue reading frames
- closeStream(se);
+ resetStream(se);
}
}
// No more frames to read so switch to the keep-alive
@@ -402,7 +402,7 @@ public class Http2UpgradeHandler extends
}
- void closeStream(StreamException se) throws ConnectionException,
IOException {
+ void resetStream(StreamException se) throws ConnectionException,
IOException {
if (log.isDebugEnabled()) {
log.debug(sm.getString("upgradeHandler.rst.debug", connectionId,
@@ -1099,7 +1099,7 @@ public class Http2UpgradeHandler extends
stream.incrementWindowSize(diff);
} catch (Http2Exception h2e) {
try {
- closeStream(new StreamException(sm.getString(
+ resetStream(new StreamException(sm.getString(
"upgradeHandler.windowSizeTooBig",
connectionId,
stream.getIdentifier()),
h2e.getError(),
stream.getIdentifier().intValue()));
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=1708463&r1=1708462&r2=1708463&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Tue Oct 13 16:37:11
2015
@@ -342,7 +342,7 @@ public class Stream extends AbstractStre
void close(Http2Exception http2Exception) {
if (http2Exception instanceof StreamException) {
try {
- handler.closeStream((StreamException) http2Exception);
+ handler.resetStream((StreamException) http2Exception);
} catch (ConnectionException ce) {
handler.closeConnection(ce);
} catch (IOException ioe) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
