Author: markt Date: Thu May 21 08:56:39 2015 New Revision: 1680768 URL: http://svn.apache.org/r1680768 Log: Re-use existing utility method
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.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=1680768&r1=1680767&r2=1680768&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Thu May 21 08:56:39 2015 @@ -629,7 +629,8 @@ public class Http2UpgradeHandler extends private void close(Http2Exception h2e) { // Write a GOAWAY frame. byte[] payload = h2e.getMessage().getBytes(StandardCharsets.UTF_8); - byte[] payloadLength = getPayloadLength(payload); + byte[] payloadLength = new byte[3]; + ByteUtil.setThreeBytes(payloadLength, 0, payload.length); try { socketWrapper.write(true, payloadLength, 0, payloadLength.length); @@ -644,19 +645,6 @@ public class Http2UpgradeHandler extends } - private byte[] getPayloadLength(byte[] payload) { - byte[] result = new byte[3]; - int len = payload.length; - result[2] = (byte) (len & 0xFF); - len = len >>> 8; - result[1] = (byte) (len & 0xFF); - len = len >>> 8; - result[0] = (byte) (len & 0xFF); - - return result; - } - - private void readFully(byte[] dest) throws IOException { int read = 0; while (read < dest.length) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org