valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-07 02:45:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

THRIFT-1008. java: byte[] accessors throw NPE on unset field

Browse Source 
Further extra null check in accessors that use TBaseHelper.rightSize().

git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1038850 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bryan Duxbury 2010-11-24 22:30:38 +00:00
parent af65f1b478
commit a5eb848930
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/cpp/src/generate/t_java_generator.cc
View File

@ -807,7 +807,8 @@ void t_java_generator::generate_union_getters_and_setters(ofstream& out, t_struc
if (type->is_base_type() && ((t_base_type*)type)->is_binary()) {
indent(out) << "public byte[] get" << cap_name << "() {" << endl;
indent(out) << " set" << cap_name << "(TBaseHelper.rightSize(buffer" << get_cap_name("for") << cap_name << "()));" << endl;
indent(out) << " return buffer" << get_cap_name("for") << cap_name << "().array();" << endl;
indent(out) << " ByteBuffer b = buffer" << get_cap_name("for") << cap_name << "();" << endl;
indent(out) << " return b == null ? null : b.array();" << endl;
indent(out) << "}" << endl;
out << endl;
@ -1889,7 +1890,7 @@ void t_java_generator::generate_java_bean_boilerplate(ofstream& out,
if (type->is_base_type() && ((t_base_type*)type)->is_binary()) {
indent(out) << "public byte[] get" << cap_name << "() {" << endl;
indent(out) << " set" << cap_name << "(TBaseHelper.rightSize(" << field_name << "));" << endl;
indent(out) << " return " << field_name << ".array();" << endl;
indent(out) << " return " << field_name << " == null ? null : " << field_name << ".array();" << endl;
indent(out) << "}" << endl << endl;
indent(out) << "public ByteBuffer buffer" << get_cap_name("for") << cap_name << "() {" << endl;
@ -1920,7 +1921,7 @@ void t_java_generator::generate_java_bean_boilerplate(ofstream& out,
out << type_name(tstruct);
}
out << " set" << cap_name << "(byte[] " << field_name << ") {" << endl;
indent(out) << " set" << cap_name << "(ByteBuffer.wrap(" << field_name << "));" << endl;
indent(out) << " set" << cap_name << "(" << field_name << " == null ? (ByteBuffer)null : ByteBuffer.wrap(" << field_name << "));" << endl;
if (!bean_style_) {
indent(out) << " return this;" << endl;
}

8
lib/java/test/org/apache/thrift/TestStruct.java
View File

@ -301,4 +301,12 @@ public class TestStruct extends TestCase {
assertEquals("JavaTestHelper(req_int:0, req_obj:, req_bin:)",
object.toString());
}
public void testBytesBufferFeatures() throws Exception {
JavaTestHelper o = new JavaTestHelper();
o.setReq_bin((ByteBuffer)null);
assertNull(o.getReq_bin());
o.setReq_bin((byte[])null);
assertNull(o.getReq_bin());
}
}