avoid depending on Linguistics equals()

1 files changed, 7 insertions, 1 deletions

diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java
index 2c56f0e356b..0aa4e4eb772 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java
@@ -103,7 +103,13 @@ public final class NGramExpression extends Expression {
         if (!(obj instanceof NGramExpression)) return false;
 
         NGramExpression rhs = (NGramExpression)obj;
-        if (linguistics != rhs.linguistics) return false;
+        if (linguistics == null) {
+            if (rhs.linguistics != null) return false;
+        } else if (rhs.linguistics != null) {
+            if (linguistics.getClass() != rhs.linguistics.getClass()) return false;
+        } else {
+            return false;
+        }
         if (gramSize != rhs.gramSize) return false;
         return true;
     }