[thrift] branch master updated: THRIFT-5016 Do Not Check 'other' For Null in Equals Client: Java Patch: David Mollitor

[jensg]

This is an automated email from the ASF dual-hosted git repository.

jensg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git


The following commit(s) were added to refs/heads/master by this push:
     new e8f82da  THRIFT-5016 Do Not Check 'other' For Null in Equals Client: 
Java Patch: David Mollitor
e8f82da is described below

commit e8f82da45e63a6477e4165e80358d613de689a82
Author: David Mollitor <dmolli...@apache.org>
AuthorDate: Mon Dec 23 10:28:31 2019 -0500

    THRIFT-5016 Do Not Check 'other' For Null in Equals
    Client: Java
    Patch: David Mollitor
    
    This closes #1937
---
 compiler/cpp/src/thrift/generate/t_java_generator.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/compiler/cpp/src/thrift/generate/t_java_generator.cc 
b/compiler/cpp/src/thrift/generate/t_java_generator.cc
index 1805585..24637d3 100644
--- a/compiler/cpp/src/thrift/generate/t_java_generator.cc
+++ b/compiler/cpp/src/thrift/generate/t_java_generator.cc
@@ -1912,8 +1912,7 @@ void 
t_java_generator::generate_java_struct_equality(ostream& out, t_struct* tst
   out << indent() << "@Override" << endl << indent() << "public boolean 
equals(java.lang.Object that) {"
       << endl;
   indent_up();
-  out << indent() << "if (that == null)" << endl << indent() << "  return 
false;" << endl
-      << indent() << "if (that instanceof " << tstruct->get_name() << ")" << 
endl << indent()
+  out << indent() << "if (that instanceof " << tstruct->get_name() << ")" << 
endl << indent()
       << "  return this.equals((" << tstruct->get_name() << ")that);" << endl 
<< indent()
       << "return false;" << endl;
   scope_down(out);