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

Explicit HEAD sorted higher than implicit GET match

Browse Source 
Issue: SPR-14182
This commit is contained in:
Rossen Stoyanchev
2016-04-17 15:12:43 -04:00
parent ff38224da6
commit 7cdcc102a9
3 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,8 +39,8 @@ import org.springframework.web.cors.CorsUtils;
*/
public final class RequestMethodsRequestCondition extends AbstractRequestCondition<RequestMethodsRequestCondition> {
private static final RequestMethodsRequestCondition HEAD_CONDITION =
new RequestMethodsRequestCondition(RequestMethod.HEAD);
private static final RequestMethodsRequestCondition GET_CONDITION =
new RequestMethodsRequestCondition(RequestMethod.GET);
private final Set<RequestMethod> methods;
@@ -140,7 +140,7 @@ public final class RequestMethodsRequestCondition extends AbstractRequestConditi
}
}
if (httpMethod == HttpMethod.HEAD && getMethods().contains(RequestMethod.GET)) {
return HEAD_CONDITION;
return GET_CONDITION;
}
}
return null;
@@ -159,7 +159,18 @@ public final class RequestMethodsRequestCondition extends AbstractRequestConditi
*/
@Override
public int compareTo(RequestMethodsRequestCondition other, HttpServletRequest request) {
return (other.methods.size() - this.methods.size());
if (other.methods.size() != this.methods.size()) {
return other.methods.size() - this.methods.size();
}
else if (this.methods.size() == 1) {
if (this.methods.contains(RequestMethod.HEAD) && other.methods.contains(RequestMethod.GET)) {
return -1;
}
else if (this.methods.contains(RequestMethod.GET) && other.methods.contains(RequestMethod.HEAD)) {
return 1;
}
}
return 0;
}
}