If the EOF is reached (means no block found or really reached the last block),

[core.git] / inc / classes / main / iterator / io / class_FileIoIterator.php

diff --git a/inc/classes/main/iterator/io/class_FileIoIterator.php b/inc/classes/main/iterator/io/class_FileIoIterator.php
index 888652f6300aa3752fd6a5670b7af898b04c3d18..20d351f5e694d09b43376e8d1badc8b6f7368dfa 100644 (file)
--- a/inc/classes/main/iterator/io/class_FileIoIterator.php
+++ b/inc/classes/main/iterator/io/class_FileIoIterator.php
@@ -150,10 +150,21 @@ class FileIoIterator extends BaseIterator implements SeekableWritableFileIterato
 
                // Wait until a entry/block separator has been found
                $data = $this->getBackBuffer();
-               while (($this->getPointerInstance()->isEndOfFileReached()) && (!$this->getBlockInstance()->isBlockSeparatorFound($data))) {
+               while ((!$this->getPointerInstance()->isEndOfFileReached()) && (!$this->getBlockInstance()->isBlockSeparatorFound($data))) {
                        // Then read the block
                        $data .= $this->read($length);
-                       /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('data()=' . strlen($data));
+                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('data()=' . strlen($data));
+               } // END - if
+
+               // EOF reached?
+               if ($this->getPointerInstance()->isEndOfFileReached()) {
+                       // Set whole data as current block
+                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('Calling setCurrentBlock(' . strlen($data) . ') ...');
+                       $this->setCurrentBlock($data);
+
+                       // Then abort here silently
+                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('EOF reached.');
+                       return;
                } // END - if
 
                /*
@@ -165,6 +176,10 @@ class FileIoIterator extends BaseIterator implements SeekableWritableFileIterato
                // Separate data
                $dataArray = explode(self::getBlockSeparator(), $data);
 
+               // This array must contain two elements
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('dataArray=' . print_r($dataArray, TRUE));
+               assert(count($dataArray) == 2);
+
                // Left part is the actual block, right one the back-buffer data
                $this->setCurrentBlock($dataArray[0]);
                $this->setBackBuffer($dataArray[1]);