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 2814099..1da60d9 100644
--- a/compiler/cpp/src/generate/t_java_generator.cc
+++ b/compiler/cpp/src/generate/t_java_generator.cc
@@ -3530,7 +3530,7 @@
// 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();