Browse Source

Polishing

See gh-27488
pull/27555/head
Arjen Poutsma 4 years ago
parent
commit
bfa01b35df
  1. 4
      spring-core/src/main/java/org/springframework/util/MimeType.java
  2. 2
      spring-web/src/main/java/org/springframework/http/MediaType.java

4
spring-core/src/main/java/org/springframework/util/MimeType.java

@ -637,14 +637,14 @@ public class MimeType implements Comparable<MimeType>, Serializable { @@ -637,14 +637,14 @@ public class MimeType implements Comparable<MimeType>, Serializable {
else if (mimeType2.isWildcardType() && !mimeType1.isWildcardType()) { // audio/* > */*
return -1;
}
else { // mediaType1.getType().equals(mediaType2.getType())
else {
if (mimeType1.isWildcardSubtype() && !mimeType2.isWildcardSubtype()) { // audio/* < audio/basic
return 1;
}
else if (mimeType2.isWildcardSubtype() && !mimeType1.isWildcardSubtype()) { // audio/basic > audio/*
return -1;
}
else { // mediaType2.getSubtype().equals(mediaType2.getSubtype())
else {
return compareParameters(mimeType1, mimeType2);
}
}

2
spring-web/src/main/java/org/springframework/http/MediaType.java

@ -798,7 +798,7 @@ public class MediaType extends MimeType implements Serializable { @@ -798,7 +798,7 @@ public class MediaType extends MimeType implements Serializable {
else if (mediaType2.isWildcardType() && !mediaType1.isWildcardType()) { // audio/* > */*
return -1;
}
else { // mediaType1.getType().equals(mediaType2.getType())
else {
if (mediaType1.isWildcardSubtype() && !mediaType2.isWildcardSubtype()) { // audio/* < audio/basic
return 1;
}

Loading…
Cancel
Save