From: Jens Geyer <jensg@apache.org>
Date: Sat, 31 May 2014 20:58:15 +0000 (+0200)
Subject: THRIFT-2435 Java compiler doesn't like struct member names that are identical to... 
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=cf18e91831507f20ac777262174288d64e3f5bbe;p=common%2Fthrift.git

THRIFT-2435 Java compiler doesn't like struct member names that are identical to an existing enum or struct type
Client: java
Patch: Jens Geyer

Fixed a potential nullptr dereference introduced by that patch (Coverity ID 1216835)
---

diff --git a/compiler/cpp/src/generate/t_java_generator.cc b/compiler/cpp/src/generate/t_java_generator.cc
index 28140995..1da60d9a 100644
--- a/compiler/cpp/src/generate/t_java_generator.cc
+++ b/compiler/cpp/src/generate/t_java_generator.cc
@@ -3530,7 +3530,7 @@ string t_java_generator::type_name(t_type* ttype, bool in_container, bool in_ini
 
   // Check for namespacing
   t_program* program = ttype->get_program();
-  if ((program != NULL && program != program_) || force_namespace) {
+  if ((program != NULL) && ((program != program_) || force_namespace)) {
     string package = program->get_namespace("java");
     if (!package.empty()) {
       return package + "." + ttype->get_name();