1 files changed, 3 insertions, 4 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/IndexedSegmentItem.java b/container-search/src/main/java/com/yahoo/prelude/query/IndexedSegmentItem.java
index 1594c6357e2..aaace3043ba 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/IndexedSegmentItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/IndexedSegmentItem.java
@@ -4,6 +4,7 @@ package com.yahoo.prelude.query;
 import com.yahoo.prelude.query.textualrepresentation.Discloser;
 
 import java.nio.ByteBuffer;
+import java.util.Objects;
 
 /**
  * Common implementation for Item classes implementing the IndexedItem interface.
@@ -60,16 +61,14 @@ public abstract class IndexedSegmentItem extends TaggableSegmentItem implements
     @Override
     public boolean equals(Object object) {
         if ( ! super.equals(object)) return false;
-
-        IndexedItem other = (IndexedItem) object; // Ensured by superclass
+        IndexedItem other = (IndexedItem) object;
         if ( ! this.index.equals(other.getIndexName())) return false;
-
         return true;
     }
 
     @Override
     public int hashCode() {
-        return super.hashCode() + 31 * index.hashCode();
+        return Objects.hash(super.hashCode(), index);
     }
 
     public abstract String getIndexedString();