commit f0f607ffacee42d133277518e3eb4835d1607386
author Andrew Bloomgarden <andrew@newrelic.com> Tue Nov 03 10:19:14 2015 -0500
committer Roger Meier <roger@apache.org> Wed Nov 04 12:32:44 2015 +0100
tree 154c94394f9f486e357aba443cd83d0796a94972
parent f57b57ac0b5e890d7d8ebb75610e7fe279833909

THRIFT-3408: correct emitted JSON types

This closes #679

compiler/cpp/src/generate/t_json_generator.cc

diff --git a/compiler/cpp/src/generate/t_json_generator.cc b/compiler/cpp/src/generate/t_json_generator.cc
index 3f44a82..10aaa64 100644
--- a/compiler/cpp/src/generate/t_json_generator.cc
+++ b/compiler/cpp/src/generate/t_json_generator.cc
@@ -701,8 +701,12 @@
   if (ttype->is_xception()) {
     return "exception";
   }
-  //if (ttype->is_base_type() && ((t_base_type*)ttype)->is_binary()) {
-  return "binary";
+  if (ttype->is_base_type()) {
+    t_base_type* tbasetype = (t_base_type*)ttype;
+    return tbasetype->is_binary() ? "binary" : t_base_type::t_base_name(tbasetype->get_base());
+  }
+
+  return "(unknown)";
 }
 
 string t_json_generator::get_qualified_name(t_type* ttype) {