diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/WeightedFairQueueByteDistributor.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/WeightedFairQueueByteDistributor.java index b7c2cddf52..461c3a72a3 100644 --- a/codec-http2/src/main/java/io/netty/handler/codec/http2/WeightedFairQueueByteDistributor.java +++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/WeightedFairQueueByteDistributor.java @@ -432,7 +432,7 @@ public final class WeightedFairQueueByteDistributor implements StreamByteDistrib @Override public int compare(State o1, State o2) { - return MathUtil.compare(o1.pseudoTimeToWrite, o2.pseudoTimeToWrite); + return Long.compare(o1.pseudoTimeToWrite, o2.pseudoTimeToWrite); } } diff --git a/common/src/main/java/io/netty/util/internal/MathUtil.java b/common/src/main/java/io/netty/util/internal/MathUtil.java index e6a042c408..5519f7a9cb 100644 --- a/common/src/main/java/io/netty/util/internal/MathUtil.java +++ b/common/src/main/java/io/netty/util/internal/MathUtil.java @@ -64,32 +64,4 @@ public final class MathUtil { return (index | length | (index + length) | (capacity - (index + length))) < 0; } - /** - * Compares two {@code int} values. - * - * @param x the first {@code int} to compare - * @param y the second {@code int} to compare - * @return the value {@code 0} if {@code x == y}; - * {@code -1} if {@code x < y}; and - * {@code 1} if {@code x > y} - */ - public static int compare(final int x, final int y) { - // do not subtract for comparison, it could overflow - return x < y ? -1 : (x > y ? 1 : 0); - } - - /** - * Compare two {@code long} values. - * @param x the first {@code long} to compare. - * @param y the second {@code long} to compare. - * @return - * - */ - public static int compare(long x, long y) { - return (x < y) ? -1 : (x > y) ? 1 : 0; - } } diff --git a/transport/src/test/java/io/netty/channel/embedded/CustomChannelId.java b/transport/src/test/java/io/netty/channel/embedded/CustomChannelId.java index 9eed54eda1..b45c6814a4 100644 --- a/transport/src/test/java/io/netty/channel/embedded/CustomChannelId.java +++ b/transport/src/test/java/io/netty/channel/embedded/CustomChannelId.java @@ -16,7 +16,6 @@ package io.netty.channel.embedded; import io.netty.channel.ChannelId; -import io.netty.util.internal.MathUtil; public class CustomChannelId implements ChannelId { @@ -31,7 +30,7 @@ public class CustomChannelId implements ChannelId { @Override public int compareTo(final ChannelId o) { if (o instanceof CustomChannelId) { - return MathUtil.compare(id, ((CustomChannelId) o).id); + return Integer.compare(id, ((CustomChannelId) o).id); } return asLongText().compareTo(o.asLongText());