fix and iterator, add some logging, and reenable

This commit is contained in:
Barak Michener 2014-08-12 16:38:10 -04:00
parent 99d44e3228
commit b6d966e9b5
3 changed files with 33 additions and 16 deletions

View file

@ -179,10 +179,13 @@ func (it *HasA) NextPath() bool {
//
// The upshot is, the end of NextPath() bubbles up from the bottom of the
// iterator tree up, and we need to respect that.
glog.V(4).Infoln("HASA", it.UID(), "NextPath")
if it.primaryIt.NextPath() {
return true
}
return it.NextContains()
result := it.NextContains()
glog.V(4).Infoln("HASA", it.UID(), "NextPath Returns", result, "")
return result
}
// Next advances the iterator. This is simpler than Contains. We have a