root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

This commit is contained in:
Arjen Poutsma 2021-09-30 16:17:36 +02:00
parent 167e538dd1 388c8e4aa5
commit 4f61e9cdee
2 changed files with 0 additions and 12 deletions
Show Stats 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

@ -637,9 +637,6 @@ public class MimeType implements Comparable<MimeType>, Serializable {
else if (mimeType2.isWildcardType() && !mimeType1.isWildcardType()) { // audio/* > */* else if (mimeType2.isWildcardType() && !mimeType1.isWildcardType()) { // audio/* > */*
return -1; return -1;
} }
else if (!mimeType1.getType().equals(mimeType2.getType())) { // audio/basic == text/html
return 0;
}
else { // mediaType1.getType().equals(mediaType2.getType()) else { // mediaType1.getType().equals(mediaType2.getType())
if (mimeType1.isWildcardSubtype() && !mimeType2.isWildcardSubtype()) { // audio/* < audio/basic if (mimeType1.isWildcardSubtype() && !mimeType2.isWildcardSubtype()) { // audio/* < audio/basic
return 1; return 1;
@ -647,9 +644,6 @@ public class MimeType implements Comparable<MimeType>, Serializable {
else if (mimeType2.isWildcardSubtype() && !mimeType1.isWildcardSubtype()) { // audio/basic > audio/* else if (mimeType2.isWildcardSubtype() && !mimeType1.isWildcardSubtype()) { // audio/basic > audio/*
return -1; return -1;
} }
else if (!mimeType1.getSubtype().equals(mimeType2.getSubtype())) { // audio/basic == audio/wave
return 0;
}
else { // mediaType2.getSubtype().equals(mediaType2.getSubtype()) else { // mediaType2.getSubtype().equals(mediaType2.getSubtype())
return compareParameters(mimeType1, mimeType2); return compareParameters(mimeType1, mimeType2);
} }

6
spring-web/src/main/java/org/springframework/http/MediaType.java
View File

@ -798,9 +798,6 @@ public class MediaType extends MimeType implements Serializable {
else if (mediaType2.isWildcardType() && !mediaType1.isWildcardType()) { // audio/* > */* else if (mediaType2.isWildcardType() && !mediaType1.isWildcardType()) { // audio/* > */*
return -1; return -1;
} }
else if (!mediaType1.getType().equals(mediaType2.getType())) { // audio/basic == text/html
return 0;
}
else { // mediaType1.getType().equals(mediaType2.getType()) else { // mediaType1.getType().equals(mediaType2.getType())
if (mediaType1.isWildcardSubtype() && !mediaType2.isWildcardSubtype()) { // audio/* < audio/basic if (mediaType1.isWildcardSubtype() && !mediaType2.isWildcardSubtype()) { // audio/* < audio/basic
return 1; return 1;
@ -808,9 +805,6 @@ public class MediaType extends MimeType implements Serializable {
else if (mediaType2.isWildcardSubtype() && !mediaType1.isWildcardSubtype()) { // audio/basic > audio/* else if (mediaType2.isWildcardSubtype() && !mediaType1.isWildcardSubtype()) { // audio/basic > audio/*
return -1; return -1;
} }
else if (!mediaType1.getSubtype().equals(mediaType2.getSubtype())) { // audio/basic == audio/wave
return 0;
}
else { else {
int paramsSize1 = mediaType1.getParameters().size(); int paramsSize1 = mediaType1.getParameters().size();
int paramsSize2 = mediaType2.getParameters().size(); int paramsSize2 = mediaType2.getParameters().size();