Skip to content

Commit 9260bcf

Browse files
authored
Fix redundant assignment (#119775) (#119791)
1 parent 5c72bce commit 9260bcf

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

server/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -268,18 +268,19 @@ private Map<String, Float> extractMultiFields(String field, boolean quoted) {
268268
if (allFields && this.field != null && this.field.equals(field)) {
269269
// "*" is the default field
270270
extractedFields = fieldsAndWeights;
271+
} else {
272+
boolean multiFields = Regex.isSimpleMatchPattern(field);
273+
// Filters unsupported fields if a pattern is requested
274+
// Filters metadata fields if all fields are requested
275+
extractedFields = resolveMappingField(
276+
context,
277+
field,
278+
1.0f,
279+
allFields == false,
280+
multiFields == false,
281+
quoted ? quoteFieldSuffix : null
282+
);
271283
}
272-
boolean multiFields = Regex.isSimpleMatchPattern(field);
273-
// Filters unsupported fields if a pattern is requested
274-
// Filters metadata fields if all fields are requested
275-
extractedFields = resolveMappingField(
276-
context,
277-
field,
278-
1.0f,
279-
allFields == false,
280-
multiFields == false,
281-
quoted ? quoteFieldSuffix : null
282-
);
283284
} else if (quoted && quoteFieldSuffix != null) {
284285
extractedFields = resolveMappingFields(context, fieldsAndWeights, quoteFieldSuffix);
285286
} else {

0 commit comments

Comments
 (0)