X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fhub%2Fmain%2Fdecoder%2Fpackage%2Fclass_PackageDecoder.php;h=2db2c2a1be50ad88a0e32c7cb49846c51ea528a1;hb=0dabbc9782dfd827ce89db9c048163626c90a515;hp=2e62c63c8cd2680f6d881809841b45258ad70fa1;hpb=c13ca7c93ee55b02d1d3320fca5d2d8d6e953768;p=hub.git

diff --git a/application/hub/main/decoder/package/class_PackageDecoder.php b/application/hub/main/decoder/package/class_PackageDecoder.php
index 2e62c63c8..2db2c2a1b 100644
--- a/application/hub/main/decoder/package/class_PackageDecoder.php
+++ b/application/hub/main/decoder/package/class_PackageDecoder.php
@@ -95,7 +95,7 @@ class PackageDecoder extends BaseDecoder implements Decodeable {
 		$discoveryInstance = PackageDiscoveryFactory::createPackageDiscoveryInstance();
 
 		// ... then disover all recipient (might be only one), this package may shall be forwarded
-		$discoveryInstance->discoverDecodedRecipients($decodedData);
+		$discoveryInstance->discoverRawRecipients($decodedData);
 
 		// Check for 'recipient' field (the 'sender' field and others are ignored here)
 		if ($discoveryInstance->isRecipientListEmpty()) {
@@ -103,21 +103,21 @@ class PackageDecoder extends BaseDecoder implements Decodeable {
 			$this->getStackerInstance()->pushNamed(self::STACKER_NAME_DECODED_PACKAGE, $decodedData);
 		} else {
 			// Forward the package to the next node
-			$this->getPackageInstance()->forwardDecodedPackage($decodedData);
+			$this->getPackageInstance()->forwardRawPackage($decodedData);
 		}
 	}
 
 	/**
 	 * Checks whether decoded packages have arrived (for this peer)
 	 *
-	 * @return	$ifDecodedPackagesLeft	Whether decoded packages have arrived
+	 * @return	$ifRawPackagesLeft	Whether decoded packages have arrived
 	 */
 	public function ifDeocedPackagesLeft () {
 		// Check it ...
-		$ifDecodedPackagesLeft = (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_DECODED_PACKAGE));
+		$ifRawPackagesLeft = (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_DECODED_PACKAGE));
 
 		// ... return it
-		return $ifDecodedPackagesLeft;
+		return $ifRawPackagesLeft;
 	}
 
 	/**
@@ -126,11 +126,14 @@ class PackageDecoder extends BaseDecoder implements Decodeable {
 	 * @return	void
 	 */
 	public function handleDecodedPackage () {
+		// Assert on amount
+		assert($this->ifDeocedPackagesLeft());
+
 		// Get the next entry (assoziative array)
 		$decodedData = $this->getStackerInstance()->popNamed(self::STACKER_NAME_DECODED_PACKAGE);
 
 		// Handle it
-		$this->getPackageInstance()->handleDecodedData($decodedData);
+		$this->getPackageInstance()->handleRawData($decodedData);
 	}
 }