From a31da6080fbe2fe48473fa5af20e32f575e81240 Mon Sep 17 00:00:00 2001
From: Sergey Bushik <sergey.bushik@altoros.com>
Date: Sun, 23 Jul 2017 17:08:48 +0300
Subject: [PATCH] Fixed regression introduced after BINARY_ACK change

---
 .../socketio/protocol/PacketDecoder.java               | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/corundumstudio/socketio/protocol/PacketDecoder.java b/src/main/java/com/corundumstudio/socketio/protocol/PacketDecoder.java
index 4473bff..c2e101b 100644
--- a/src/main/java/com/corundumstudio/socketio/protocol/PacketDecoder.java
+++ b/src/main/java/com/corundumstudio/socketio/protocol/PacketDecoder.java
@@ -302,10 +302,12 @@ public class PacketDecoder {
 
             if (packet.getSubType() == PacketType.EVENT
                     || packet.getSubType() == PacketType.BINARY_EVENT) {
-                ByteBufInputStream in = new ByteBufInputStream(frame);
-                Event event = jsonSupport.readValue(packet.getNsp(), in, Event.class);
-                packet.setName(event.getName());
-                packet.setData(event.getArgs());
+                if (!packet.hasAttachments() || packet.isAttachmentsLoaded()) {
+                    ByteBufInputStream in = new ByteBufInputStream(frame);
+                    Event event = jsonSupport.readValue(packet.getNsp(), in, Event.class);
+                    packet.setName(event.getName());
+                    packet.setData(event.getArgs());
+                }
             }
         }
     }