From 0aa4d6c9670076fd5a474c23e340384e66e2a1df Mon Sep 17 00:00:00 2001
From: Redkale <8730487+redkale@users.noreply.github.com>
Date: Fri, 15 Mar 2019 10:19:00 +0800
Subject: [PATCH]

---
 src/org/redkale/net/http/WebSocketPacket.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/org/redkale/net/http/WebSocketPacket.java b/src/org/redkale/net/http/WebSocketPacket.java
index 357254731..39e136b4f 100644
--- a/src/org/redkale/net/http/WebSocketPacket.java
+++ b/src/org/redkale/net/http/WebSocketPacket.java
@@ -461,7 +461,7 @@ public final class WebSocketPacket {
             }
         }
         if (length > wsmaxbody && wsmaxbody > 0) {
-            logger.log(Level.INFO, "message length (" + length + ") too big, must less " + wsmaxbody + "");
+            logger.log(Level.WARNING, "message length (" + length + ") too big, must less " + wsmaxbody + "");
             return null;
         }
         this.receiveLength = length;
@@ -495,7 +495,8 @@ public final class WebSocketPacket {
             buffers = webSocket._engine.cryptor.decrypt(buffers, context.getBufferSupplier(), context.getBufferConsumer());
         }
         FrameType selfType = this.type;
-        if (selfType == FrameType.SERIES) {
+        final boolean series = selfType == FrameType.SERIES;
+        if (series) {
             selfType = runner.currSeriesMergeFrameType;
             this.type = selfType;
         } else if (!this.last && (selfType == FrameType.TEXT || selfType == FrameType.BINARY)) {
@@ -504,7 +505,7 @@ public final class WebSocketPacket {
 
         if (selfType == FrameType.TEXT) {
             Convert textConvert = webSocket.getTextConvert();
-            if (textConvert == null) {
+            if (textConvert == null || (!runner.mergemsg && (series || !this.last))) {
                 this.receiveMessage = new String(this.getReceiveBytes(buffers), StandardCharsets.UTF_8);
                 this.receiveType = MessageType.STRING;
             } else {
@@ -529,7 +530,7 @@ public final class WebSocketPacket {
             }
         } else if (selfType == FrameType.BINARY) {
             Convert binaryConvert = webSocket.getBinaryConvert();
-            if (binaryConvert == null) {
+            if (binaryConvert == null || (!runner.mergemsg && (series || !this.last))) {
                 this.receiveMessage = this.getReceiveBytes(buffers);
                 this.receiveType = MessageType.BYTES;
             } else {