Repository: thrift Updated Branches: refs/heads/0.10.0 bcc070377 -> 0c2a93eb3 (forced update)
THRIFT-3946 Java 1.5 compatibility broken for binary fields (java5 option) Client: Java Patch: Philip Hamer Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/015fe527 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/015fe527 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/015fe527 Branch: refs/heads/0.10.0 Commit: 015fe5272cdcfc14063384ad9cc2d083cd5e2b09 Parents: af81cf0 Author: Jens Geyer <je...@apache.org> Authored: Mon Oct 17 23:00:11 2016 +0200 Committer: Jens Geyer <je...@apache.org> Committed: Mon Oct 17 23:00:11 2016 +0200 ---------------------------------------------------------------------- compiler/cpp/src/thrift/generate/t_java_generator.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/015fe527/compiler/cpp/src/thrift/generate/t_java_generator.cc ---------------------------------------------------------------------- diff --git a/compiler/cpp/src/thrift/generate/t_java_generator.cc b/compiler/cpp/src/thrift/generate/t_java_generator.cc index 4feb626..a45c676 100644 --- a/compiler/cpp/src/thrift/generate/t_java_generator.cc +++ b/compiler/cpp/src/thrift/generate/t_java_generator.cc @@ -447,8 +447,7 @@ string t_java_generator::java_type_imports() { + "import java.util.HashMap;\n" + "import java.util.EnumMap;\n" + "import java.util.Set;\n" + "import java.util.HashSet;\n" + "import java.util.EnumSet;\n" + tree_set_and_map + "import java.util.Collections;\n" + "import java.util.BitSet;\n" - + "import java.nio.ByteBuffer;\n" - + "import java.util.Arrays;\n" + annotation_generated + + "import java.nio.ByteBuffer;\n" + annotation_generated + "import org.slf4j.Logger;\n" + "import org.slf4j.LoggerFactory;\n\n"; } @@ -923,7 +922,7 @@ void t_java_generator::generate_union_constructor(ofstream& out, t_struct* tstru indent(out) << " " << type_name(tstruct) << " x = new " << type_name(tstruct) << "();" << endl; indent(out) << " x.set" << get_cap_name((*m_iter)->get_name()) - << "(ByteBuffer.wrap(Arrays.copyOf(value, value.length)));" << endl; + << "(ByteBuffer.wrap(value.clone()));" << endl; indent(out) << " return x;" << endl; indent(out) << "}" << endl << endl; } @@ -1002,7 +1001,7 @@ void t_java_generator::generate_union_getters_and_setters(ofstream& out, t_struc indent(out) << "public void set" << get_cap_name(field->get_name()) << "(byte[] value) {" << endl; indent(out) << " set" << get_cap_name(field->get_name()) - << "(ByteBuffer.wrap(Arrays.copyOf(value, value.length)));" << endl; + << "(ByteBuffer.wrap(value.clone()));" << endl; indent(out) << "}" << endl; out << endl; @@ -2443,8 +2442,7 @@ void t_java_generator::generate_java_bean_boilerplate(ofstream& out, t_struct* t } out << " set" << cap_name << "(byte[] " << field_name << ") {" << endl; indent(out) << " this." << field_name << " = " << field_name << " == null ? (ByteBuffer)null" - << " : ByteBuffer.wrap(Arrays.copyOf(" << field_name << ", " << field_name - << ".length));" << endl; + << " : ByteBuffer.wrap(" << field_name << ".clone());" << endl; if (!bean_style_) { indent(out) << " return this;" << endl; }
