THRIFT-1008. java: byte[] accessors throw NPE on unset field
This patch adds a null check to TBaseHelper.rightSize().
git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1038833 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/java/src/org/apache/thrift/TBaseHelper.java b/lib/java/src/org/apache/thrift/TBaseHelper.java
index 2837d0b..5898d5b 100644
--- a/lib/java/src/org/apache/thrift/TBaseHelper.java
+++ b/lib/java/src/org/apache/thrift/TBaseHelper.java
@@ -270,6 +270,9 @@
}
public static ByteBuffer rightSize(ByteBuffer in) {
+ if (in == null) {
+ return null;
+ }
if (wrapsFullArray(in)) {
return in;
}
diff --git a/lib/java/test/org/apache/thrift/TestTBaseHelper.java b/lib/java/test/org/apache/thrift/TestTBaseHelper.java
index 6d72ad8..6378524 100644
--- a/lib/java/test/org/apache/thrift/TestTBaseHelper.java
+++ b/lib/java/test/org/apache/thrift/TestTBaseHelper.java
@@ -151,6 +151,10 @@
assertEquals(ByteBuffer.wrap(b1, 1, 3), ByteBuffer.wrap(b3));
}
+ public void testRightSize() throws Exception {
+ assertNull(TBaseHelper.rightSize(null));
+ }
+
public void testCopyBinaryWithByteBuffer() throws Exception {
byte[] bytes = new byte[]{0, 1, 2, 3, 4, 5};
ByteBuffer b = ByteBuffer.wrap(bytes);