Added null check

piergm · piergm · commit 81e979490fdd · 2023-06-26T15:32:41.000+02:00
diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightPhase.java
@@ -168,7 +168,9 @@ private Query getHighlightQuery(
     ) {
         if (fieldType instanceof ConstantFieldType) {
             QueryBuilder originalQuery = highlightContext.originalQuery();
-            return originalQuery.toHighlightQuery(fieldType.name());
+            if (originalQuery != null) {
+                return originalQuery.toHighlightQuery(fieldType.name());
+            }
         }
         return field.fieldOptions().highlightQuery();
     }

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,9 @@ private Query getHighlightQuery(`
`168`	`168`	`) {`
`169`	`169`	`if (fieldType instanceof ConstantFieldType) {`
`170`	`170`	`QueryBuilder originalQuery = highlightContext.originalQuery();`
`171`		`- return originalQuery.toHighlightQuery(fieldType.name());`
	`171`	`+ if (originalQuery != null) {`
	`172`	`+ return originalQuery.toHighlightQuery(fieldType.name());`
	`173`	`+ }`
`172`	`174`	`}`
`173`	`175`	`return field.fieldOptions().highlightQuery();`
`174`	`176`	`}`