lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Redkale
2019-09-26 16:27:42 +08:00
parent 22cc7e086c
commit fba43894c1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/redkale/net/http/HttpResponse.java
View File

@@ -391,7 +391,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
this.header.addValue("retinfo", ret.getRetinfo()); this.header.addValue("retinfo", ret.getRetinfo());
} }
Convert convert = ret == null ? null : ret.convert(); Convert convert = ret == null ? null : ret.convert();
if (convert == null) convert = request.getJsonConvert(); if (convert == null || !(convert instanceof TextConvert)) convert = request.getJsonConvert();
finish(convert.convertTo(getBodyBufferSupplier(), ret)); finish(convert.convertTo(getBodyBufferSupplier(), ret));
} }
@@ -510,7 +510,9 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
} else if (result.getResult() instanceof CharSequence) { } else if (result.getResult() instanceof CharSequence) {
finish(result.getResult().toString()); finish(result.getResult().toString());
} else { } else {
finish(result.convert() == null ? convert : result.convert(), result.getResult()); Convert cc = result.convert();
if (cc == null || !(cc instanceof TextConvert)) cc = convert;
finish(cc, result.getResult());
} }
} else { } else {
if (hasRender) { if (hasRender) {