Added assert() + noisy debug line + fixed double-implementation of an interface.

[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 9ef4801d2a25dc6ab807492ea9c4744b3056afc6..ba1019ab0385f37c54fef80ba51043374c0a21d4 100644 (file)
--- a/inc/classes/main/iterator/io/class_FileIoIterator.php
+++ b/inc/classes/main/iterator/io/class_FileIoIterator.php
@@ -150,7 +150,7 @@ 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));
@@ -159,6 +159,7 @@ class FileIoIterator extends BaseIterator implements SeekableWritableFileIterato
                // EOF reached?
                if ($this->getPointerInstance()->isEndOfFileReached()) {
                        // Then abort here silently
+                       /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('EOF reached.');
                        return;
                } // END - if
 
@@ -171,6 +172,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]);