aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Duff <bduff@google.com>2014-09-17 07:13:39 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-09-17 07:13:40 +0000
commit14e2f6cb376a7a7f5b0c0541e60052fe4b373782 (patch)
treedea506a915ea4facdad29d36ef3f7a0d0cf933f5
parente1458bba77d190202b98096aec63e5ee18ec0684 (diff)
parent87bd4029cfdb77196748063277bd7bb172f5ff54 (diff)
downloadprotobuf-14e2f6cb376a7a7f5b0c0541e60052fe4b373782.tar.gz
protobuf-14e2f6cb376a7a7f5b0c0541e60052fe4b373782.tar.bz2
protobuf-14e2f6cb376a7a7f5b0c0541e60052fe4b373782.zip
Merge "Includes a MessageNano subclass's name's hashCode in hashCode calculations."
-rw-r--r--src/google/protobuf/compiler/javanano/javanano_message.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_message.cc b/src/google/protobuf/compiler/javanano/javanano_message.cc
index 7a2b4a06..cc44cd35 100644
--- a/src/google/protobuf/compiler/javanano/javanano_message.cc
+++ b/src/google/protobuf/compiler/javanano/javanano_message.cc
@@ -523,6 +523,7 @@ void MessageGenerator::GenerateHashCode(io::Printer* printer) {
printer->Indent();
printer->Print("int result = 17;\n");
+ printer->Print("result = 31 * result + getClass().getName().hashCode();\n");
for (int i = 0; i < descriptor_->field_count(); i++) {
const FieldDescriptor* field = descriptor_->field(i);
field_generators_.get(field).GenerateHashCodeCode(printer);