commit c04fb0069e814d761248f26a24142730d5e80501
author Max Spencer <mrmaxspencer@googlemail.com> Tue Nov 10 11:34:19 2015 +0000
committer Nobuaki Sukegawa <nsuke@apache.org> Wed Nov 11 00:32:55 2015 +0900
tree f7868b948853ecaed986ff4fae7312548ae05236
parent 317d515428eed7a821d81c49e080c9aefeb39d35

THRIFT-2974 fix optional writeToParcel
Client: Java
Patch: Max Spencer

This closes #687

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 9da52d1..733852f 100644
--- a/compiler/cpp/src/generate/t_java_generator.cc
+++ b/compiler/cpp/src/generate/t_java_generator.cc
@@ -1634,7 +1634,7 @@
     } else if (type_name(t) == "float") {
       indent(out) << "out.writeFloat(" << name << ");" << endl;
     } else if (t->is_enum()) {
-      indent(out) << "out.writeInt(" << name << ".getValue());" << endl;
+      indent(out) << "out.writeInt(" << name << " != null ? " << name << ".getValue() : -1);" << endl;
     } else if (t->is_list()) {
       if (((t_list*)t)->get_elem_type()->get_true_type()->is_struct()) {
         indent(out) << "out.writeTypedList(" << name << ");" << endl;