This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch branch-4.6
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/branch-4.6 by this push:
new ac3f1ac Issue-1001 merge DoubleByteBuffer from master
ac3f1ac is described below
commit ac3f1aca808b8c8b9e96401e0190b00fe29b1754
Author: Enrico Olivelli <[email protected]>
AuthorDate: Thu Jan 18 04:18:03 2018 +0100
Issue-1001 merge DoubleByteBuffer from master
---
.../org/apache/bookkeeper/util/DoubleByteBuf.java | 23 +++++++++-------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/DoubleByteBuf.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/DoubleByteBuf.java
index c254d40..d20a7d2 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/DoubleByteBuf.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/DoubleByteBuf.java
@@ -122,11 +122,6 @@ public final class DoubleByteBuf extends
AbstractReferenceCountedByteBuf {
}
@Override
- public int readableBytes() {
- return b1.readableBytes() + b2.readableBytes();
- }
-
- @Override
public int writableBytes() {
return 0;
}
@@ -419,23 +414,23 @@ public final class DoubleByteBuf extends
AbstractReferenceCountedByteBuf {
private static final Constructor<ByteBuf>
advancedLeakAwareByteBufConstructor;
static {
- Constructor<ByteBuf> _simpleLeakAwareByteBufConstructor = null;
- Constructor<ByteBuf> _advancedLeakAwareByteBufConstructor = null;
+ Constructor<ByteBuf> tmpSimpleLeakAwareByteBufConstructor = null;
+ Constructor<ByteBuf> tmpAdvancedLeakAwareByteBufConstructor = null;
try {
Class<?> simpleLeakAwareByteBufClass =
Class.forName("io.netty.buffer.SimpleLeakAwareByteBuf");
- _simpleLeakAwareByteBufConstructor = (Constructor<ByteBuf>)
simpleLeakAwareByteBufClass
+ tmpSimpleLeakAwareByteBufConstructor = (Constructor<ByteBuf>)
simpleLeakAwareByteBufClass
.getDeclaredConstructor(ByteBuf.class,
ResourceLeakTracker.class);
- _simpleLeakAwareByteBufConstructor.setAccessible(true);
+ tmpSimpleLeakAwareByteBufConstructor.setAccessible(true);
Class<?> advancedLeakAwareByteBufClass =
Class.forName("io.netty.buffer.AdvancedLeakAwareByteBuf");
- _advancedLeakAwareByteBufConstructor = (Constructor<ByteBuf>)
advancedLeakAwareByteBufClass
+ tmpAdvancedLeakAwareByteBufConstructor = (Constructor<ByteBuf>)
advancedLeakAwareByteBufClass
.getDeclaredConstructor(ByteBuf.class,
ResourceLeakTracker.class);
- _advancedLeakAwareByteBufConstructor.setAccessible(true);
+ tmpAdvancedLeakAwareByteBufConstructor.setAccessible(true);
} catch (Throwable t) {
log.error("Failed to use reflection to enable leak detection", t);
} finally {
- simpleLeakAwareByteBufConstructor =
_simpleLeakAwareByteBufConstructor;
- advancedLeakAwareByteBufConstructor =
_advancedLeakAwareByteBufConstructor;
+ simpleLeakAwareByteBufConstructor =
tmpSimpleLeakAwareByteBufConstructor;
+ advancedLeakAwareByteBufConstructor =
tmpAdvancedLeakAwareByteBufConstructor;
}
}
@@ -466,4 +461,4 @@ public final class DoubleByteBuf extends
AbstractReferenceCountedByteBuf {
throw new RuntimeException(t);
}
}
-}
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
