From e564157381e0d2a23aab97ea50cfe0eb79dd6cc1 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Fri, 11 Jan 2013 07:45:22 +0100 Subject: [PATCH] Fix one checkstyle and one compile error caused by the last commit --- .../main/java/io/netty/buffer/PooledUnsafeDirectByteBuf.java | 5 +++-- .../main/java/io/netty/util/internal/PlatformDependent0.java | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buffer/src/main/java/io/netty/buffer/PooledUnsafeDirectByteBuf.java b/buffer/src/main/java/io/netty/buffer/PooledUnsafeDirectByteBuf.java index 40cae42f6f..83f0cb36f2 100644 --- a/buffer/src/main/java/io/netty/buffer/PooledUnsafeDirectByteBuf.java +++ b/buffer/src/main/java/io/netty/buffer/PooledUnsafeDirectByteBuf.java @@ -16,6 +16,7 @@ package io.netty.buffer; +import io.netty.util.internal.PlatformDependent; import sun.misc.Unsafe; import java.io.IOException; @@ -57,7 +58,7 @@ final class PooledUnsafeDirectByteBuf extends PooledByteBuf { if (addressField.getLong(directBuf) == 0) { throw new Error("direct buffer address must be non-zero"); } - UnpooledDirectByteBuf.freeDirect(directBuf); + PlatformDependent.freeDirectBuffer(directBuf); } catch (Throwable t) { throw new Error(t); } @@ -120,7 +121,7 @@ final class PooledUnsafeDirectByteBuf extends PooledByteBuf { public int getUnsignedMedium(int index) { checkIndex(index, 3); long addr = addr(index); - return (UNSAFE.getByte(addr) & 0xff) << 16 |(UNSAFE.getByte(addr + 1) & 0xff) << 8 | + return (UNSAFE.getByte(addr) & 0xff) << 16 | (UNSAFE.getByte(addr + 1) & 0xff) << 8 | UNSAFE.getByte(addr + 2) & 0xff; } diff --git a/common/src/main/java/io/netty/util/internal/PlatformDependent0.java b/common/src/main/java/io/netty/util/internal/PlatformDependent0.java index 37d097981b..d7c31b3160 100644 --- a/common/src/main/java/io/netty/util/internal/PlatformDependent0.java +++ b/common/src/main/java/io/netty/util/internal/PlatformDependent0.java @@ -96,7 +96,6 @@ final class PlatformDependent0 { return UNSAFE.objectFieldOffset(field); } - private PlatformDependent0() { } }