From fb175349d4dd8ff6c982d47005909dbc650383d8 Mon Sep 17 00:00:00 2001 From: "tingley%sundell.net" Date: Fri, 1 Mar 2002 04:33:11 +0000 Subject: [PATCH] Checkin for timeless@bemail.org to fix bug 128223: don't assert if a child datasource doesn't return an (empty) enumerator along with NS_RDF_NO_VALUE. r=tingley, sr=darin, a=shaver --- rdf/base/src/nsCompositeDataSource.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rdf/base/src/nsCompositeDataSource.cpp b/rdf/base/src/nsCompositeDataSource.cpp index c0af3e2d130..ee2d868841d 100644 --- a/rdf/base/src/nsCompositeDataSource.cpp +++ b/rdf/base/src/nsCompositeDataSource.cpp @@ -238,6 +238,8 @@ CompositeEnumeratorImpl::HasMoreElements(PRBool* aResult) rv = GetEnumerator(datasource, &mCurrent); if (NS_FAILED(rv)) return rv; + if (rv == NS_RDF_NO_VALUE) + continue; NS_ASSERTION(mCurrent != nsnull, "you're always supposed to return an enumerator from GetEnumerator, punk."); if (! mCurrent)