From: Roland Häder <roland@mxchange.org>
Date: Fri, 23 Mar 2012 21:32:46 +0000 (+0000)
Subject: More fix for the EOP chunk
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9f1e17f739807480f3ee3da4ffc5709bef580225;p=hub.git

More fix for the EOP chunk
---

diff --git a/application/hub/main/class_BaseHubSystem.php b/application/hub/main/class_BaseHubSystem.php
index 845daef6b..978f6922c 100644
--- a/application/hub/main/class_BaseHubSystem.php
+++ b/application/hub/main/class_BaseHubSystem.php
@@ -290,6 +290,7 @@ class BaseHubSystem extends BaseFrameworkSystem {
 		$chunkSplits = explode(PackageFragmenter::CHUNK_DATA_HASH_SEPARATOR, $chunks[count($chunks) - 1]);
 
 		// Make sure chunks with only 3 elements are parsed (for details see ChunkHandler)
+		//* NOISY-DEBUG: */ $this->debugOutput('eopChunk=' . $chunks[count($chunks) - 1] . ',chunkSplits=' . print_r($chunkSplits,true));
 		assert(count($chunkSplits) == 3);
 
 		// Validate final chunk
diff --git a/application/hub/main/package/assembler/class_PackageAssembler.php b/application/hub/main/package/assembler/class_PackageAssembler.php
index f90f81c7a..e518008ae 100644
--- a/application/hub/main/package/assembler/class_PackageAssembler.php
+++ b/application/hub/main/package/assembler/class_PackageAssembler.php
@@ -97,6 +97,7 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable
 		 * their checksums. Also the final chunk must be handled.
 		 */
 		$chunks = explode(PackageFragmenter::CHUNK_SEPARATOR, $packageContent[BaseRawDataHandler::PACKAGE_DECODED_DATA]);
+		//* NOISY-DEBUG */ $this->debugOutput('chunks='.print_r($chunks,true));
 
 		// Validate final chunk
 		if (!$this->isValidFinalChunk($chunks)) {
diff --git a/application/hub/main/package/fragmenter/class_PackageFragmenter.php b/application/hub/main/package/fragmenter/class_PackageFragmenter.php
index a7fee59b3..622e56f34 100644
--- a/application/hub/main/package/fragmenter/class_PackageFragmenter.php
+++ b/application/hub/main/package/fragmenter/class_PackageFragmenter.php
@@ -317,7 +317,7 @@ class PackageFragmenter extends BaseFrameworkSystem implements Fragmentable, Reg
 		$chunkData =
 			self::END_OF_PACKAGE_IDENTIFIER .
 			$finalHash . self::CHUNK_HASH_SEPARATOR .
-			$chunkHash . self::CHUNK_SEPARATOR;
+			$chunkHash;
 
 		// Add it as regular chunk
 		$this->addChunkData($finalHash, $chunkData);
@@ -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;
 	}