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

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2018-02-12 15:55:18 +01:00
parent d5cabca2f7
commit b089ded5b0
3 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-core/src/main/java/org/springframework/util/MimeType.java
View File

@@ -310,7 +310,7 @@ public class MimeType implements Comparable<MimeType>, Serializable {
if (other == null) {
return false;
}
if (this.isWildcardType()) {
if (isWildcardType()) {
// */* includes anything
return true;
}
@@ -318,7 +318,7 @@ public class MimeType implements Comparable<MimeType>, Serializable {
if (getSubtype().equals(other.getSubtype())) {
return true;
}
if (this.isWildcardSubtype()) {
if (isWildcardSubtype()) {
// Wildcard with suffix, e.g. application/*+xml
int thisPlusIdx = getSubtype().lastIndexOf('+');
if (thisPlusIdx == -1) {
@@ -362,7 +362,7 @@ public class MimeType implements Comparable<MimeType>, Serializable {
return true;
}
// Wildcard with suffix? e.g. application/*+xml
if (this.isWildcardSubtype() || other.isWildcardSubtype()) {
if (isWildcardSubtype() || other.isWildcardSubtype()) {
int thisPlusIdx = getSubtype().lastIndexOf('+');
int otherPlusIdx = other.getSubtype().lastIndexOf('+');
if (thisPlusIdx == -1 && otherPlusIdx == -1) {