This block has to be the last to make sure that pendingData contains all received...

diff --git a/application/hub/main/tasks/network/class_NetworkPackageReaderTask.php b/application/hub/main/tasks/network/class_NetworkPackageReaderTask.php
index dcb3f9531684967ccd112ec666e39953278fb86d..057324e98627a862f35b67e87f1fa0b34d198d70 100644 (file)
--- a/application/hub/main/tasks/network/class_NetworkPackageReaderTask.php
+++ b/application/hub/main/tasks/network/class_NetworkPackageReaderTask.php
@@ -77,9 +77,6 @@ class NetworkPackageReaderTask extends BaseTask implements Taskable, Visitable {
                if ($this->getPackageInstance()->isNewPackageArrived()) {
                        // Okay, then handle newly arrived package
                        $this->getPackageInstance()->handleNewlyArrivedPackage();
-               } elseif ($this->getPackageInstance()->ifAssemblerHasPendingDataLeft()) {
-                       // Okay, handle it here
-                       $this->getPackageInstance()->handleAssemblerPendingData();
                } elseif ($this->getPackageInstance()->isIncomingDecodedDataHandled()) {
                        /*
                         * We have handled decoded data so we should validate it, if we have
@@ -90,6 +87,9 @@ class NetworkPackageReaderTask extends BaseTask implements Taskable, Visitable {
                } elseif ($this->getPackageInstance()->isNewRawDataPending($this->getListenerPoolInstance())) {
                        // We have to handle raw data from the socket
                        $this->getPackageInstance()->handleIncomingDecodedData();
+               } elseif ($this->getPackageInstance()->ifAssemblerHasPendingDataLeft()) {
+                       // Okay, handle it here
+                       $this->getPackageInstance()->handleAssemblerPendingData();
                } // END - if
        }
 }