From a4f0f4867aa5ee4028de211386e2361a8d139a66 Mon Sep 17 00:00:00 2001 From: Kane York Date: Tue, 26 Sep 2017 14:50:56 -0700 Subject: [PATCH] Don't re-marshal if we already have the JSON --- socketserver/server/handlecore.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/socketserver/server/handlecore.go b/socketserver/server/handlecore.go index 07d095db..6b1db227 100644 --- a/socketserver/server/handlecore.go +++ b/socketserver/server/handlecore.go @@ -586,7 +586,9 @@ func MarshalClientMessage(clientMessage interface{}) (int, []byte, error) { msg.MessageID = -1 } - if msg.Arguments != nil { + if msg.origArguments != "" { + dataStr = fmt.Sprintf("%d %s %s", msg.MessageID, msg.Command, msg.origArguments) + } else if msg.Arguments != nil { argBytes, err := json.Marshal(msg.Arguments) if err != nil { return 0, nil, err