fix Unexpected wire type error caused when message spans across multi…

…ple requests
Rxnet · Mar 1, 2019 · b27511d · b27511d
1 parent f29e988
commit b27511d
Showing 1 changed file with 17 additions and 19 deletions.
diff --git a/src/Rxnet/EventStore/ReadBuffer.php b/src/Rxnet/EventStore/ReadBuffer.php
@@ -47,25 +47,23 @@ public function onNext($value)
             $value = $this->currentMessage . $value;
         }
 
-        do {
-            $buffer = new Buffer($value);
-            $dataLength = strlen($value);
-            $messageLength = $buffer->readInt32LE(0) + MessageConfiguration::INT_32_LENGTH;
-
-            if ($dataLength == $messageLength) {
-                $socketMessages[] = $this->decomposeMessage($value);
-                $this->currentMessage = null;
-            } elseif ($dataLength > $messageLength) {
-                $message = substr($value, 0, $messageLength);
-                $socketMessages[] = $this->decomposeMessage($message);
-
-                // reset data to next message
-                $value = substr($value, $messageLength, $dataLength);
-                $this->currentMessage = null;
-            } else {
-                $this->currentMessage .= $value;
-            }
-        } while ($dataLength > $messageLength);
+        $buffer = new Buffer($value);
+        $dataLength = strlen($value);
+        $messageLength = $buffer->readInt32LE(0) + MessageConfiguration::INT_32_LENGTH;
+
+        if ($dataLength == $messageLength) {
+            $socketMessages[] = $this->decomposeMessage($value);
+            $this->currentMessage = null;
+        } elseif ($dataLength > $messageLength) {
+            $message = substr($value, 0, $messageLength);
+            $socketMessages[] = $this->decomposeMessage($message);
+
+            // reset data to next message
+            $value = substr($value, $messageLength);
+            $this->currentMessage = $value;
+        } else {
+            $this->currentMessage = $value;
+        }
 
         //echo "messages : ".count($socketMessages) ." for ".count($this->observers)." observers \n";
         foreach ($socketMessages as $message) {