From: Roland Häder <roland@mxchange.org>
Date: Fri, 23 Mar 2012 22:19:18 +0000 (+0000)
Subject: Switched around sub-tasks, commented out noisy debug line
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2df5f509a62f14aadeb473929c8fa40f0800ffb3;p=hub.git

Switched around sub-tasks, commented out noisy debug line
---

diff --git a/application/hub/main/package/fragmenter/class_PackageFragmenter.php b/application/hub/main/package/fragmenter/class_PackageFragmenter.php
index 622e56f34..9b1b8d52d 100644
--- a/application/hub/main/package/fragmenter/class_PackageFragmenter.php
+++ b/application/hub/main/package/fragmenter/class_PackageFragmenter.php
@@ -382,7 +382,7 @@ class PackageFragmenter extends BaseFrameworkSystem implements Fragmentable, Reg
 		assert(strlen($rawData) <= NetworkPackage::TCP_PACKAGE_SIZE);
 
 		// Add it to the array
-		/* NOISY-DEBUG: */ $this->debugOutput('FRAGMENTER: Adding ' . strlen($rawData) . ' bytes of a chunk ...');
+		//* NOISY-DEBUG: */ $this->debugOutput('FRAGMENTER: Adding ' . strlen($rawData) . ' bytes of a chunk ...');
 		$this->chunks[$finalHash][]      = $rawData;
 		$this->chunkHashes[$finalHash][] = $rawDataHash;
 	}
diff --git a/application/hub/main/tasks/network/class_NetworkPackageReaderTask.php b/application/hub/main/tasks/network/class_NetworkPackageReaderTask.php
index 7e10c0e84..da672097a 100644
--- a/application/hub/main/tasks/network/class_NetworkPackageReaderTask.php
+++ b/application/hub/main/tasks/network/class_NetworkPackageReaderTask.php
@@ -74,9 +74,9 @@ class NetworkPackageReaderTask extends BaseTask implements Taskable, Visitable {
 	 */
 	public function executeTask () {
 		// Do we have something to handle?
-		if ($this->getPackageInstance()->isNewRawDataPending($this->getListenerPoolInstance())) {
-			// We have to handle raw data from the socket
-			$this->getPackageInstance()->handleIncomingDecodedData();
+		if ($this->getPackageInstance()->isNewPackageArrived()) {
+			// Okay, then handle newly arrived package
+			$this->getPackageInstance()->handleNewlyArrivedPackage();
 		} elseif ($this->getPackageInstance()->isIncomingDecodedDataHandled()) {
 			/*
 			 * We have handled decoded data so we should validate it, if we have
@@ -84,9 +84,9 @@ class NetworkPackageReaderTask extends BaseTask implements Taskable, Visitable {
 			 * network package.
 			 */
 			$this->getPackageInstance()->assembleDecodedDataToPackage();
-		} elseif ($this->getPackageInstance()->isNewPackageArrived()) {
-			// Okay, then handle newly arrived package
-			$this->getPackageInstance()->handleNewlyArrivedPackage();
+		} elseif ($this->getPackageInstance()->isNewRawDataPending($this->getListenerPoolInstance())) {
+			// We have to handle raw data from the socket
+			$this->getPackageInstance()->handleIncomingDecodedData();
 		} // END - if
 	}
 }
diff --git a/application/hub/main/tasks/network/class_NetworkPackageWriterTask.php b/application/hub/main/tasks/network/class_NetworkPackageWriterTask.php
index 12cbd092d..e410f660b 100644
--- a/application/hub/main/tasks/network/class_NetworkPackageWriterTask.php
+++ b/application/hub/main/tasks/network/class_NetworkPackageWriterTask.php
@@ -70,15 +70,15 @@ class NetworkPackageWriterTask extends BaseTask implements Taskable, Visitable {
 	 */
 	public function executeTask () {
 		// Do we have something to deliver?
-		if ($this->getPackageInstance()->isPackageEnqueued()) {
-			// Okay, then deliver (better discover its recipients) this package
-			$this->getPackageInstance()->declareEnqueuedPackage();
+		if ($this->getPackageInstance()->isPackageWaitingForDelivery()) {
+			// Sent it finally out
+			$this->getPackageInstance()->sendWaitingPackage();
 		} elseif ($this->getPackageInstance()->isPackageDeclared()) {
 			// Prepare package for delivery
 			$this->getPackageInstance()->deliverDeclaredPackage();
-		} elseif ($this->getPackageInstance()->isPackageWaitingForDelivery()) {
-			// Sent it finally out
-			$this->getPackageInstance()->sendWaitingPackage();
+		} elseif ($this->getPackageInstance()->isPackageEnqueued()) {
+			// Okay, then deliver (better discover its recipients) this package
+			$this->getPackageInstance()->declareEnqueuedPackage();
 		}
 	}
 }