Revert "Polishing"

This reverts commit bfa01b3.
poutsma · Oct 20, 2021 · d63217b · d63217b
1 parent b681c6b
commit d63217b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/spring-core/src/main/java/org/springframework/util/MimeType.java b/spring-core/src/main/java/org/springframework/util/MimeType.java
@@ -636,14 +636,14 @@ public int compare(T mimeType1, T mimeType2) {
 			else if (mimeType2.isWildcardType() && !mimeType1.isWildcardType()) {  // audio/* > */*
 				return -1;
 			}
-			else {
+			else {  // mediaType1.getType().equals(mediaType2.getType())
 				if (mimeType1.isWildcardSubtype() && !mimeType2.isWildcardSubtype()) {  // audio/* < audio/basic
 					return 1;
 				}
 				else if (mimeType2.isWildcardSubtype() && !mimeType1.isWildcardSubtype()) {  // audio/basic > audio/*
 					return -1;
 				}
-				else {
+				else {  // mediaType2.getSubtype().equals(mediaType2.getSubtype())
 					return compareParameters(mimeType1, mimeType2);
 				}
 			}

diff --git a/spring-web/src/main/java/org/springframework/http/MediaType.java b/spring-web/src/main/java/org/springframework/http/MediaType.java
@@ -798,7 +798,7 @@ else if (mediaType1.isWildcardType() && !mediaType2.isWildcardType()) {  // */*
 		else if (mediaType2.isWildcardType() && !mediaType1.isWildcardType()) {  // audio/* > */*
 			return -1;
 		}
-		else {
+		else {  // mediaType1.getType().equals(mediaType2.getType())
 			if (mediaType1.isWildcardSubtype() && !mediaType2.isWildcardSubtype()) {  // audio/* < audio/basic
 				return 1;
 			}