Skip to content

Commit 2f2091d

Browse files
author
Vladimir Kotal
committed
make hashCode robust w.r.t. null
1 parent ea44b3a commit 2f2091d

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

opengrok-indexer/src/main/java/org/opengrok/indexer/history/HistoryEntry.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,14 @@ private boolean checkEquals(Object o1, Object o2) {
223223
return (o1 == null && o2 == null);
224224
}
225225

226+
private int getHashCode(Object o) {
227+
if (o == null) {
228+
return 0;
229+
}
230+
231+
return o.hashCode();
232+
}
233+
226234
@Override
227235
public boolean equals(Object o) {
228236
if (this == o) {
@@ -252,7 +260,7 @@ public boolean equals(Object o) {
252260

253261
@Override
254262
public int hashCode() {
255-
return getAuthor().hashCode() + getRevision().hashCode() + getDate().hashCode() + getMessage().hashCode() +
256-
getFiles().hashCode() + (getTags() != null ? getTags().hashCode() : 0);
263+
return getHashCode(getAuthor()) + getHashCode(getRevision()) + getHashCode(getDate()) +
264+
getHashCode(getMessage()) + getHashCode(getFiles()) + getHashCode(getTags());
257265
}
258266
}

0 commit comments

Comments
 (0)