tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-07 05:54:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

SimpleQuery: Initialize self::$iteratorPosition as late as possible

Browse Source 
refs #9632
This commit is contained in:
Johannes Meyer 2015-08-03 14:09:55 +02:00
parent 6a17d7cb26
commit dbc2f98053
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/Icinga/Data/SimpleQuery.php
View File

@ -158,7 +158,7 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
} }
$this->iterator->rewind(); $this->iterator->rewind();
$this->iteratorPosition = 0; $this->iteratorPosition = null;
Benchmark::measure('Query result iteration started'); Benchmark::measure('Query result iteration started');
} }
@ -190,6 +190,8 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
if (! $valid) { if (! $valid) {
Benchmark::measure('Query result iteration finished'); Benchmark::measure('Query result iteration finished');
return false; return false;
} elseif ($this->iteratorPosition === null) {
$this->iteratorPosition = 0;
} }
return true; return true;