tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RepositoryQuery: Do not bypass the query's own iterator 

refs #9661
This commit is contained in:
Johannes Meyer 2015-07-31 13:12:41 +02:00
parent c5b5d3c9c3
commit fe41d312ca
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/Icinga/Repository/RepositoryQuery.php
View File

@ -5,6 +5,7 @@ namespace Icinga\Repository;
use Iterator;
use IteratorAggregate;
use Traversable;
use Icinga\Application\Benchmark;
use Icinga\Application\Logger;
use Icinga\Data\QueryInterface;
@ -581,7 +582,12 @@ class RepositoryQuery implements QueryInterface, SortRules, Iterator
$this->order();
}
$iterator = $this->repository->getDataSource()->query($this->query);
if ($this->query instanceof Traversable) {
$iterator = $this->query;
} else {
$iterator = $this->repository->getDataSource()->query($this->query);
}
if ($iterator instanceof IteratorAggregate) {
$this->iterator = $iterator->getIterator();
} else {