Author: markt Date: Thu Jun 18 09:45:43 2015 New Revision: 1686157 URL: http://svn.apache.org/r1686157 Log: Remove unused code
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties 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=1686157&r1=1686156&r2=1686157&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Thu Jun 18 09:45:43 2015 @@ -317,24 +317,6 @@ public class Http2UpgradeHandler extends } - private void swallow(int len) throws IOException { - if (len == 0) { - return; - } - int read = 0; - byte[] buffer = new byte[1024]; - while (read < len) { - int toRead = Math.min(buffer.length, len - read); - int thisTime = socketWrapper.read(true, buffer, 0, toRead); - if (thisTime == -1) { - throw new IOException( - sm.getString("upgradeHandler.swallow.eos", Integer.valueOf(len))); - } - read += thisTime; - } - } - - ConnectionSettings getRemoteSettings() { return remoteSettings; } 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=1686157&r1=1686156&r2=1686157&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Thu Jun 18 09:45:43 2015 @@ -82,7 +82,6 @@ upgradeHandler.stream.closed=Stream [{0} upgradeHandler.stream.even=A new remote stream ID of [{0}] was requested but all remote streams must use odd identifiers upgradeHandler.stream.old=A new remote stream ID of [{0}] was requested but the most recent stream was [{1}] upgradeHandler.tooManyRemoteStreams=The client attempted to use more than [{0}] active streams -upgradeHandler.swallow.eos=End of stream found while trying to swallow [{0}] bytes upgradeHandler.unexpectedEos=Unexpected end of stream upgradeHandler.unexpectedStatus=An unexpected value of status ([{0}]) was passed to this method upgradeHandler.upgrade=Connection [{0}], HTTP/1.1 upgrade to stream [1] --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org