Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.1.x'

Browse Source
This commit is contained in:
Rossen Stoyanchev
2019-03-26 21:14:51 -04:00
parent b646943350 c54355784e
commit 68a529b915
21 changed files with 538 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java
View File

@@ -142,7 +142,13 @@ public final class HeadersRequestCondition extends AbstractRequestCondition<Head
}
private long getValueMatchCount(Set<HeaderExpression> expressions) {
return expressions.stream().filter(e -> e.getValue() != null && !e.isNegated()).count();
long count = 0;
for (HeaderExpression e : expressions) {
if (e.getValue() != null && !e.isNegated()) {
count++;
}
}
return count;
}

8
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
View File

@@ -127,7 +127,13 @@ public final class ParamsRequestCondition extends AbstractRequestCondition<Param
}
private long getValueMatchCount(Set<ParamExpression> expressions) {
return expressions.stream().filter(e -> e.getValue() != null && !e.isNegated()).count();
long count = 0;
for (ParamExpression e : expressions) {
if (e.getValue() != null && !e.isNegated()) {
count++;
}
}
return count;
}