fuhouyin/fastjson2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix no return Content-Length in the hearders

Browse Source
This commit is contained in:
陈柏良 2024-03-05 19:03:13 +08:00 committed by Shaojin Wen
parent 31bd3323c1
commit e5cde6ad3e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extension-spring6/src/main/java/com/alibaba/fastjson2/support/spring6/http/converter/FastJsonHttpMessageConverter.java
View File

@ -120,24 +120,24 @@ public class FastJsonHttpMessageConverter
protected void writeInternal(Object object, HttpOutputMessage outputMessage) throws IOException, HttpMessageNotWritableException {
HttpHeaders headers = outputMessage.getHeaders();
try {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
int contentLength;
if (object instanceof String && JSON.isValidObject((String) object)) {
byte[] strBytes = ((String) object).getBytes(config.getCharset());
contentLength = strBytes.length;
outputMessage.getBody().write(strBytes, 0, strBytes.length);
baos.write(strBytes, 0, strBytes.length);
} else if (object instanceof byte[] && JSON.isValid((byte[]) object)) {
byte[] strBytes = (byte[]) object;
contentLength = strBytes.length;
outputMessage.getBody().write(strBytes, 0, strBytes.length);
baos.write(strBytes, 0, strBytes.length);
} else {
if (object instanceof JSONPObject) {
headers.setContentType(APPLICATION_JAVASCRIPT);
}
contentLength = JSON.writeTo(
outputMessage.getBody(),
object, config.getDateFormat(),
baos, object,
config.getDateFormat(),
config.getWriterFilters(),
config.getWriterFeatures()
);
@ -146,6 +146,8 @@ public class FastJsonHttpMessageConverter
if (headers.getContentLength() < 0 && config.isWriteContentLength()) {
headers.setContentLength(contentLength);
}
baos.writeTo(outputMessage.getBody());
} catch (JSONException ex) {
throw new HttpMessageNotWritableException("Could not write JSON: " + ex.getMessage(), ex);
} catch (IOException ex) {