From 5e02c569f2bb4a408c2d795c515e22f74606c9ab Mon Sep 17 00:00:00 2001
From: JianBo He <heeejianbo@gmail.com>
Date: Sat, 21 Mar 2020 13:38:48 +0800
Subject: [PATCH] Fix emqx_json encode return types error

---
 src/emqx_json.erl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/emqx_json.erl b/src/emqx_json.erl
index 5ec285db5..847c91b34 100644
--- a/src/emqx_json.erl
+++ b/src/emqx_json.erl
@@ -55,7 +55,7 @@ encode(Term) ->
 
 -spec(encode(json_term(), encode_options()) -> json_text()).
 encode(Term, Opts) ->
-    jiffy:encode(to_ejson(Term), Opts).
+    to_binary(jiffy:encode(to_ejson(Term), Opts)).
 
 -spec(safe_encode(json_term())
       -> {ok, json_text()} | {error, Reason :: term()}).
@@ -118,3 +118,7 @@ from_ejson({L}) ->
     [{Name, from_ejson(Value)} || {Name, Value} <- L];
 from_ejson(T) -> T.
 
+to_binary(B) when is_binary(B) -> B;
+to_binary(L) when is_list(L) ->
+    iolist_to_binary(L).
+