diff --git a/buffer/src/main/java/io/netty/buffer/ByteBufUtil.java b/buffer/src/main/java/io/netty/buffer/ByteBufUtil.java index e7dcb133e1..be330a9e64 100644 --- a/buffer/src/main/java/io/netty/buffer/ByteBufUtil.java +++ b/buffer/src/main/java/io/netty/buffer/ByteBufUtil.java @@ -33,8 +33,8 @@ public final class ByteBufUtil { static { final char[] DIGITS = "0123456789abcdef".toCharArray(); for (int i = 0; i < 256; i ++) { - HEXDUMP_TABLE[(i << 1) + 0] = DIGITS[i >>> 4 & 0x0F]; - HEXDUMP_TABLE[(i << 1) + 1] = DIGITS[i >>> 0 & 0x0F]; + HEXDUMP_TABLE[ i << 1 ] = DIGITS[i >>> 4 & 0x0F]; + HEXDUMP_TABLE[(i << 1) + 1] = DIGITS[i & 0x0F]; } } diff --git a/buffer/src/main/java/io/netty/buffer/DirectByteBuf.java b/buffer/src/main/java/io/netty/buffer/DirectByteBuf.java index 0c0072dc29..0273267f50 100644 --- a/buffer/src/main/java/io/netty/buffer/DirectByteBuf.java +++ b/buffer/src/main/java/io/netty/buffer/DirectByteBuf.java @@ -15,6 +15,8 @@ */ package io.netty.buffer; +import sun.misc.Cleaner; + import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -25,8 +27,6 @@ import java.nio.channels.ClosedChannelException; import java.nio.channels.GatheringByteChannel; import java.nio.channels.ScatteringByteChannel; -import sun.misc.Cleaner; - /** * A NIO {@link ByteBuffer} based buffer. It is recommended to use {@link Unpooled#directBuffer(int)} * and {@link Unpooled#wrappedBuffer(ByteBuffer)} instead of calling the @@ -208,8 +208,7 @@ public class DirectByteBuf extends AbstractByteBuf { @Override public int getUnsignedMedium(int index) { - return (getByte(index) & 0xff) << 16 | (getByte(index + 1) & 0xff) << 8 | - (getByte(index + 2) & 0xff) << 0; + return (getByte(index) & 0xff) << 16 | (getByte(index + 1) & 0xff) << 8 | getByte(index + 2) & 0xff; } @Override @@ -278,7 +277,7 @@ public class DirectByteBuf extends AbstractByteBuf { public ByteBuf setMedium(int index, int value) { setByte(index, (byte) (value >>> 16)); setByte(index + 1, (byte) (value >>> 8)); - setByte(index + 2, (byte) (value >>> 0)); + setByte(index + 2, (byte) value); return this; } diff --git a/buffer/src/main/java/io/netty/buffer/HeapByteBuf.java b/buffer/src/main/java/io/netty/buffer/HeapByteBuf.java index fc92fee715..09dd6eca9d 100644 --- a/buffer/src/main/java/io/netty/buffer/HeapByteBuf.java +++ b/buffer/src/main/java/io/netty/buffer/HeapByteBuf.java @@ -237,7 +237,7 @@ public class HeapByteBuf extends AbstractByteBuf { public int getUnsignedMedium(int index) { return (array[index] & 0xff) << 16 | (array[index + 1] & 0xff) << 8 | - (array[index + 2] & 0xff) << 0; + array[index + 2] & 0xff; } @Override @@ -245,7 +245,7 @@ public class HeapByteBuf extends AbstractByteBuf { return (array[index] & 0xff) << 24 | (array[index + 1] & 0xff) << 16 | (array[index + 2] & 0xff) << 8 | - (array[index + 3] & 0xff) << 0; + array[index + 3] & 0xff; } @Override @@ -257,13 +257,13 @@ public class HeapByteBuf extends AbstractByteBuf { ((long) array[index + 4] & 0xff) << 24 | ((long) array[index + 5] & 0xff) << 16 | ((long) array[index + 6] & 0xff) << 8 | - ((long) array[index + 7] & 0xff) << 0; + (long) array[index + 7] & 0xff; } @Override public ByteBuf setShort(int index, int value) { array[index] = (byte) (value >>> 8); - array[index + 1] = (byte) (value >>> 0); + array[index + 1] = (byte) value; return this; } @@ -271,7 +271,7 @@ public class HeapByteBuf extends AbstractByteBuf { public ByteBuf setMedium(int index, int value) { array[index] = (byte) (value >>> 16); array[index + 1] = (byte) (value >>> 8); - array[index + 2] = (byte) (value >>> 0); + array[index + 2] = (byte) value; return this; } @@ -280,7 +280,7 @@ public class HeapByteBuf extends AbstractByteBuf { array[index] = (byte) (value >>> 24); array[index + 1] = (byte) (value >>> 16); array[index + 2] = (byte) (value >>> 8); - array[index + 3] = (byte) (value >>> 0); + array[index + 3] = (byte) value; return this; } @@ -293,7 +293,7 @@ public class HeapByteBuf extends AbstractByteBuf { array[index + 4] = (byte) (value >>> 24); array[index + 5] = (byte) (value >>> 16); array[index + 6] = (byte) (value >>> 8); - array[index + 7] = (byte) (value >>> 0); + array[index + 7] = (byte) value; return this; } diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameEncoder.java index 0bc9c54bb0..c46007a09b 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameEncoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameEncoder.java @@ -15,7 +15,6 @@ */ package io.netty.handler.codec.spdy; -import static io.netty.handler.codec.spdy.SpdyCodecUtil.*; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelFuture; @@ -27,6 +26,8 @@ import io.netty.util.CharsetUtil; import java.util.Set; +import static io.netty.handler.codec.spdy.SpdyCodecUtil.*; + /** * Encodes a SPDY Data or Control Frame into a {@link ByteBuf}. */ @@ -192,7 +193,7 @@ public class SpdyFrameEncoder extends MessageToByteEncoder { // Chromium Issue 79156 // SPDY setting ids are not written in network byte order // Write id assuming the architecture is little endian - out.writeByte(id >> 0 & 0xFF); + out.writeByte(id & 0xFF); out.writeByte(id >> 8 & 0xFF); out.writeByte(id >> 16 & 0xFF); out.writeByte(ID_flags);