fix NPEs, possible bugs somewhere

LinkedInAttic · Dec 3, 2011 · abe1f8b · abe1f8b
1 parent c6e55f2
commit abe1f8b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/com/kamikaze/docidset/impl/AndDocIdSet.java b/src/main/java/com/kamikaze/docidset/impl/AndDocIdSet.java
@@ -59,6 +59,8 @@ class AndDocIdSetIterator extends DocIdSetIterator {
       for (DocIdSet set : sets) {
         if (set != null) {
           DocIdSetIterator dcit = set.iterator();
+          if(dcit == null)
+            dcit = DocIdSet.EMPTY_DOCIDSET.iterator();
           iterators[j++] = dcit;
         }
       }

diff --git a/src/main/java/com/kamikaze/docidset/impl/OrDocIdSetIterator.java b/src/main/java/com/kamikaze/docidset/impl/OrDocIdSetIterator.java
@@ -29,7 +29,7 @@ public Item(DocIdSetIterator iter)
     _size = 0;
     for(DocIdSet set : sets)
     {
-      _heap[_size++] = new Item(set.iterator());
+      _heap[_size++] = new Item(set.iterator()==null? DocIdSet.EMPTY_DOCIDSET.iterator() : set.iterator());
     }
     if(_size == 0) _curDoc = DocIdSetIterator.NO_MORE_DOCS;
   }