You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2015/04/16 21:29:59 UTC
thrift git commit: THRIFT-3098 Print binary typedefs the same way we
do binary fields Client: Java Patch: Roshan George
Repository: thrift
Updated Branches:
refs/heads/master fdf019810 -> f9c318ca9
THRIFT-3098 Print binary typedefs the same way we do binary fields
Client: Java
Patch: Roshan George <ro...@arjie.com>
This closes #445
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/f9c318ca
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/f9c318ca
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/f9c318ca
Branch: refs/heads/master
Commit: f9c318ca9e4b176a9b0220f9c8e872089ac8e720
Parents: fdf0198
Author: Jens Geyer <je...@apache.org>
Authored: Thu Apr 16 21:29:20 2015 +0200
Committer: Jens Geyer <je...@apache.org>
Committed: Thu Apr 16 21:29:20 2015 +0200
----------------------------------------------------------------------
compiler/cpp/src/generate/t_java_generator.cc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/f9c318ca/compiler/cpp/src/generate/t_java_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_java_generator.cc b/compiler/cpp/src/generate/t_java_generator.cc
index 3d8da1e..ee58ad5 100644
--- a/compiler/cpp/src/generate/t_java_generator.cc
+++ b/compiler/cpp/src/generate/t_java_generator.cc
@@ -2420,17 +2420,17 @@ void t_java_generator::generate_java_struct_tostring(ofstream& out, t_struct* ts
indent_up();
}
- if (field->get_type()->is_base_type() && ((t_base_type*)(field->get_type()))->is_binary()) {
+ if (get_true_type(field->get_type())->is_base_type() && ((t_base_type*)(get_true_type(field->get_type())))->is_binary()) {
indent(out) << "org.apache.thrift.TBaseHelper.toString(this." << field->get_name() << ", sb);"
<< endl;
} else if ((field->get_type()->is_set()) &&
- (((t_set*) field->get_type())->get_elem_type()->is_base_type()) &&
- (((t_base_type*) ((t_set*) field->get_type())->get_elem_type())->is_binary())) {
+ (get_true_type(((t_set*) field->get_type())->get_elem_type())->is_base_type()) &&
+ (((t_base_type*) get_true_type(((t_set*) field->get_type())->get_elem_type()))->is_binary())) {
indent(out) << "org.apache.thrift.TBaseHelper.toString(this." << field->get_name() << ", sb);"
<< endl;
} else if ((field->get_type()->is_list()) &&
- (((t_list*) field->get_type())->get_elem_type()->is_base_type()) &&
- (((t_base_type*) ((t_list*) field->get_type())->get_elem_type())->is_binary())) {
+ (get_true_type(((t_list*) field->get_type())->get_elem_type())->is_base_type()) &&
+ (((t_base_type*) get_true_type(((t_list*) field->get_type())->get_elem_type()))->is_binary())) {
indent(out) << "org.apache.thrift.TBaseHelper.toString(this." << field->get_name() << ", sb);"
<< endl;
} else {