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

Merge branch '6.1.x'

This commit is contained in:
Sébastien Deleuze 2024-02-27 15:52:13 +01:00
parent 69dabe9df5 dc1ef23780
commit 9e7c64270b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -113,6 +113,7 @@ public class ResourceHttpMessageConverter extends AbstractHttpMessageConverter<R
} }
@Override @Override
@Nullable
protected Long getContentLength(Resource resource, @Nullable MediaType contentType) throws IOException { protected Long getContentLength(Resource resource, @Nullable MediaType contentType) throws IOException {
// Don't try to determine contentLength on InputStreamResource - cannot be read afterwards... // Don't try to determine contentLength on InputStreamResource - cannot be read afterwards...
// Note: custom InputStreamResource subclasses could provide a pre-calculated content length! // Note: custom InputStreamResource subclasses could provide a pre-calculated content length!

3
spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -561,6 +561,7 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener
} }
@Override @Override
@Nullable
protected Long getContentLength(Object object, @Nullable MediaType contentType) throws IOException { protected Long getContentLength(Object object, @Nullable MediaType contentType) throws IOException {
if (object instanceof MappingJacksonValue mappingJacksonValue) { if (object instanceof MappingJacksonValue mappingJacksonValue) {
object = mappingJacksonValue.getValue(); object = mappingJacksonValue.getValue();