From fba43894c151caac57a4ed01eee96a1b35060fe5 Mon Sep 17 00:00:00 2001
From: Redkale <8730487+redkale@users.noreply.github.com>
Date: Thu, 26 Sep 2019 16:27:42 +0800
Subject: [PATCH]

---
 src/org/redkale/net/http/HttpResponse.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/org/redkale/net/http/HttpResponse.java b/src/org/redkale/net/http/HttpResponse.java
index 526486775..1c299f200 100644
--- a/src/org/redkale/net/http/HttpResponse.java
+++ b/src/org/redkale/net/http/HttpResponse.java
@@ -391,7 +391,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
             this.header.addValue("retinfo", ret.getRetinfo());
         }
         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));
     }
 
@@ -510,7 +510,9 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
             } else if (result.getResult() instanceof CharSequence) {
                 finish(result.getResult().toString());
             } 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 {
             if (hasRender) {