Fix bug in EncoderHttpMessageWriter.isStreamingMediaType()

sbrannen · sbrannen · commit 59fdce111675 · 2019-05-09T13:24:27.000+02:00
diff --git a/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java
@@ -50,6 +50,7 @@
  * @author Sebastien Deleuze
  * @author Rossen Stoyanchev
  * @author Brian Clozel
+ * @author Sam Brannen
  * @since 5.0
  * @param <T> the type of objects in the input stream
  */
@@ -171,7 +172,7 @@ private boolean isStreamingMediaType(@Nullable MediaType contentType) {
 		}
 		for (MediaType mediaType : ((HttpMessageEncoder<?>) this.encoder).getStreamingMediaTypes()) {
 			if (contentType.isCompatibleWith(mediaType) &&
-					contentType.getParameters().entrySet().containsAll(mediaType.getParameters().keySet())) {
+					contentType.getParameters().keySet().containsAll(mediaType.getParameters().keySet())) {
 				return true;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@`
`50`	`50`	`* @author Sebastien Deleuze`
`51`	`51`	`* @author Rossen Stoyanchev`
`52`	`52`	`* @author Brian Clozel`
	`53`	`+ * @author Sam Brannen`
`53`	`54`	`* @since 5.0`
`54`	`55`	`* @param <T> the type of objects in the input stream`
`55`	`56`	`*/`
`@@ -171,7 +172,7 @@ private boolean isStreamingMediaType(@Nullable MediaType contentType) {`
`171`	`172`	`}`
`172`	`173`	`for (MediaType mediaType : ((HttpMessageEncoder<?>) this.encoder).getStreamingMediaTypes()) {`
`173`	`174`	`if (contentType.isCompatibleWith(mediaType) &&`
`174`		`- contentType.getParameters().entrySet().containsAll(mediaType.getParameters().keySet())) {`
	`175`	`+ contentType.getParameters().keySet().containsAll(mediaType.getParameters().keySet())) {`
`175`	`176`	`return true;`
`176`	`177`	`}`
`177`	`178`	`}`