File tree Expand file tree Collapse file tree 2 files changed +12
-0
lines changed
spring-core/src/main/java/org/springframework/util
spring-web/src/main/java/org/springframework/http Expand file tree Collapse file tree 2 files changed +12
-0
lines changed Original file line number Diff line number Diff line change @@ -637,13 +637,19 @@ public int compare(T mimeType1, T mimeType2) {
637
637
else if (mimeType2 .isWildcardType () && !mimeType1 .isWildcardType ()) { // audio/* > */*
638
638
return -1 ;
639
639
}
640
+ else if (!mimeType1 .getType ().equals (mimeType2 .getType ())) { // audio/basic == text/html
641
+ return 0 ;
642
+ }
640
643
else { // mediaType1.getType().equals(mediaType2.getType())
641
644
if (mimeType1 .isWildcardSubtype () && !mimeType2 .isWildcardSubtype ()) { // audio/* < audio/basic
642
645
return 1 ;
643
646
}
644
647
else if (mimeType2 .isWildcardSubtype () && !mimeType1 .isWildcardSubtype ()) { // audio/basic > audio/*
645
648
return -1 ;
646
649
}
650
+ else if (!mimeType1 .getSubtype ().equals (mimeType2 .getSubtype ())) { // audio/basic == audio/wave
651
+ return 0 ;
652
+ }
647
653
else { // mediaType2.getSubtype().equals(mediaType2.getSubtype())
648
654
return compareParameters (mimeType1 , mimeType2 );
649
655
}
Original file line number Diff line number Diff line change @@ -798,13 +798,19 @@ else if (mediaType1.isWildcardType() && !mediaType2.isWildcardType()) { // */*
798
798
else if (mediaType2 .isWildcardType () && !mediaType1 .isWildcardType ()) { // audio/* > */*
799
799
return -1 ;
800
800
}
801
+ else if (!mediaType1 .getType ().equals (mediaType2 .getType ())) { // audio/basic == text/html
802
+ return 0 ;
803
+ }
801
804
else { // mediaType1.getType().equals(mediaType2.getType())
802
805
if (mediaType1 .isWildcardSubtype () && !mediaType2 .isWildcardSubtype ()) { // audio/* < audio/basic
803
806
return 1 ;
804
807
}
805
808
else if (mediaType2 .isWildcardSubtype () && !mediaType1 .isWildcardSubtype ()) { // audio/basic > audio/*
806
809
return -1 ;
807
810
}
811
+ else if (!mediaType1 .getSubtype ().equals (mediaType2 .getSubtype ())) { // audio/basic == audio/wave
812
+ return 0 ;
813
+ }
808
814
else {
809
815
int paramsSize1 = mediaType1 .getParameters ().size ();
810
816
int paramsSize2 = mediaType2 .getParameters ().size ();
You can’t perform that action at this time.
0 commit comments