Merge pull request #32 from usergrid/USERGRID-2862-limitfix Fixes NPE issue in the union iterator
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/832017bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/832017bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/832017bf Branch: refs/pull/30/merge Commit: 832017bf7b1c2e8b809b8254f2fd70eebab58d0f Parents: b22115a 5d75a29 Author: Rod Simpson <[email protected]> Authored: Mon Jan 20 18:21:28 2014 -0800 Committer: Rod Simpson <[email protected]> Committed: Mon Jan 20 18:21:28 2014 -0800 ---------------------------------------------------------------------- .../query/ir/result/UnionIterator.java | 9 ++- .../query/ir/result/UnionIteratorTest.java | 70 ++++++++++++++++++++ 2 files changed, 78 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
