Skip to content

Commit bcd69f1

Browse files
piergmfzowl
authored andcommitted
Sets CPSMode(true) only if CPS is enabled and searchRequest is allowCrossProject (elastic#137011)
1 parent 03c9a24 commit bcd69f1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

server/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public static void parseSearchRequest(
245245
searchRequest.routing(request.param("routing"));
246246
searchRequest.preference(request.param("preference"));
247247
IndicesOptions indicesOptions = IndicesOptions.fromRequest(request, searchRequest.indicesOptions());
248-
if (crossProjectEnabled) {
248+
if (crossProjectEnabled && searchRequest.allowsCrossProject()) {
249249
indicesOptions = IndicesOptions.builder(indicesOptions)
250250
.crossProjectModeOptions(new IndicesOptions.CrossProjectModeOptions(true))
251251
.build();

0 commit comments

Comments
 (0)