Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.1.x'

Browse Source
This commit is contained in:
Sam Brannen
2019-05-09 13:25:21 +02:00
parent e465f51d56 59fdce1116
commit 8e29eca1eb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java
View File

@@ -50,6 +50,7 @@ import org.springframework.util.Assert;
* @author Sebastien Deleuze * @author Sebastien Deleuze
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @author Brian Clozel * @author Brian Clozel
* @author Sam Brannen
* @since 5.0 * @since 5.0
* @param <T> the type of objects in the input stream * @param <T> the type of objects in the input stream
*/ */
@@ -171,7 +172,7 @@ public class EncoderHttpMessageWriter<T> implements HttpMessageWriter<T> {
} }
for (MediaType mediaType : ((HttpMessageEncoder<?>) this.encoder).getStreamingMediaTypes()) { for (MediaType mediaType : ((HttpMessageEncoder<?>) this.encoder).getStreamingMediaTypes()) {
if (contentType.isCompatibleWith(mediaType) && if (contentType.isCompatibleWith(mediaType) &&
contentType.getParameters().entrySet().containsAll(mediaType.getParameters().keySet())) { contentType.getParameters().keySet().containsAll(mediaType.getParameters().keySet())) {
return true; return true;
} }
} }