fix npe

jimczi · Jun 11, 2024 · 9317bcb · 9317bcb
1 parent 3cb0843
commit 9317bcb
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java b/server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java
@@ -469,15 +469,16 @@ void executeRequest(
         });
 
         final SearchSourceBuilder source = searchRequest.source();
-        final RetrieverBuilder retriever = source.retrieverBuilder();
-        if (retriever == null) {
+        if (source != null && source.retrieverBuilder() == null) {
             Rewriteable.rewriteAndFetch(
-                searchRequest,
-                searchService.getRewriteContext(timeProvider::absoluteStartMillis, resolvedIndices),
-                rewriteSearchRequestListener
+                    searchRequest,
+                    searchService.getRewriteContext(timeProvider::absoluteStartMillis, resolvedIndices),
+                    rewriteSearchRequestListener
             );
             return;
-        } else if (retriever != null && retriever.isCompound() && source.pointInTimeBuilder() == null) {
+        }
+        final RetrieverBuilder retriever = source.retrieverBuilder();
+        if (retriever != null && retriever.isCompound() && source.pointInTimeBuilder() == null) {
             OpenPointInTimeRequest pitReq = new OpenPointInTimeRequest(searchRequest.indices()).indicesOptions(
                 searchRequest.indicesOptions()
             ).preference(searchRequest.preference()).routing(searchRequest.routing()).keepAlive(TimeValue.ONE_MINUTE);