From f1e2475cd43d3f26c885f21d38766e173afc8f4f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 27 Apr 2012 20:01:13 +0000 Subject: [PATCH] This block has to be the last to make sure that pendingData contains all received blocks --- .../main/tasks/network/class_NetworkPackageReaderTask.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/hub/main/tasks/network/class_NetworkPackageReaderTask.php b/application/hub/main/tasks/network/class_NetworkPackageReaderTask.php index dcb3f9531..057324e98 100644 --- 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 } } -- 2.39.5