From 251fd03cd78ef6996d4252450bda596a5e8b11b9 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Thu, 25 Jun 2015 00:13:12 +0200
Subject: The hashCode() method now generates a magic prime instead of 0 for
 the hash of null values; this reduces collisions.

---
 src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/core/lombok/eclipse')

diff --git a/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java b/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java
index 7e2ff513..77fe3a52 100644
--- a/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java
+++ b/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java
@@ -358,7 +358,7 @@ public class HandleEqualsAndHashCode extends EclipseAnnotationHandler<EqualsAndH
 					statements.add(createResultCalculation(source, fieldAccessor));
 				} else /* objects */ {
 					/* final java.lang.Object $fieldName = this.fieldName; */
-					/* $fieldName == null ? 0 : $fieldName.hashCode() */
+					/* $fieldName == null ? NULL_PRIME : $fieldName.hashCode() */
 					statements.add(createLocalDeclaration(source, dollarFieldName, generateQualifiedTypeRef(source, TypeConstants.JAVA_LANG_OBJECT), fieldAccessor));
 					
 					SingleNameReference copy1 = new SingleNameReference(dollarFieldName, p);
@@ -375,8 +375,8 @@ public class HandleEqualsAndHashCode extends EclipseAnnotationHandler<EqualsAndH
 					setGeneratedBy(nullLiteral, source);
 					EqualExpression objIsNull = new EqualExpression(copy2, nullLiteral, OperatorIds.EQUAL_EQUAL);
 					setGeneratedBy(objIsNull, source);
-					IntLiteral int0 = makeIntLiteral("0".toCharArray(), source);
-					ConditionalExpression nullOrHashCode = new ConditionalExpression(objIsNull, int0, hashCodeCall);
+					IntLiteral intMagic = makeIntLiteral(String.valueOf(HandlerUtil.primeForNull()).toCharArray(), source);
+					ConditionalExpression nullOrHashCode = new ConditionalExpression(objIsNull, intMagic, hashCodeCall);
 					nullOrHashCode.sourceStart = pS; nullOrHashCode.sourceEnd = pE;
 					setGeneratedBy(nullOrHashCode, source);
 					statements.add(createResultCalculation(source, nullOrHashCode));
-- 
cgit