svn commit: r1745179 - in /tomcat/trunk/java/org/apache/coyote/http2: Http2UpgradeHandler.java Stream.java

[markt]

Author: markt
Date: Mon May 23 12:54:09 2016
New Revision: 1745179

URL: http://svn.apache.org/viewvc?rev=1745179&view=rev
Log:
Rename for consistency

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=1745179&r1=1745178&r2=1745179&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Mon May 
23 12:54:09 2016
@@ -1223,7 +1223,7 @@ public class Http2UpgradeHandler extends
     public void reset(int streamId, long errorCode) throws Http2Exception  {
         Stream stream = getStream(streamId, true);
         stream.checkState(FrameType.RST);
-        stream.reset(errorCode);
+        stream.receiveReset(errorCode);
     }
 
 

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=1745179&r1=1745178&r2=1745179&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Mon May 23 12:54:09 
2016
@@ -117,7 +117,7 @@ public class Stream extends AbstractStre
     }
 
 
-    public void reset(long errorCode) {
+    void receiveReset(long errorCode) {
         if (log.isDebugEnabled()) {
             log.debug(sm.getString("stream.reset.debug", getConnectionId(), 
getIdentifier(),
                     Long.toString(errorCode)));
@@ -379,7 +379,7 @@ public class Stream extends AbstractStre
         if (http2Exception instanceof StreamException) {
             try {
                 StreamException se = (StreamException) http2Exception;
-                reset(se.getError().getCode());
+                receiveReset(se.getError().getCode());
                 handler.sendStreamReset(se);
             } catch (IOException ioe) {
                 ConnectionException ce = new ConnectionException(



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