File tree Expand file tree Collapse file tree 1 file changed +8
-4
lines changed
exist-core/src/main/java/org/exist/xquery Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Original file line number Diff line number Diff line change 3636import org .exist .xquery .value .SequenceIterator ;
3737import org .exist .xquery .value .Type ;
3838import org .exist .xquery .value .ValueSequence ;
39+ import org .exist .xquery .value .BooleanValue ;
3940
4041import javax .annotation .Nullable ;
4142import java .util .Set ;
@@ -377,10 +378,13 @@ private Sequence selectByNodeSet(final Sequence contextSequence) throws XPathExc
377378 final NodeSet contextSet = contextSequence .toNodeSet ();
378379 final boolean contextIsVirtual = contextSet instanceof VirtualNodeSet ;
379380 contextSet .setTrackMatches (false );
380- final Sequence x = super .eval (contextSet , null );
381- if (!(x instanceof NodeSet ))
382- return x ;
383- final NodeSet nodes = result .toNodeSet ();
381+ final Sequence res = super .eval (contextSet , null );
382+ if (!(res instanceof NodeSet )) {
383+ if (res == BooleanValue .FALSE )
384+ return NodeSet .EMPTY_SET ;
385+ return res ;
386+ }
387+ final NodeSet nodes = res .toNodeSet ();
384388
385389 /*
386390 * if the predicate expression returns results from the cache we can
You can’t perform that action at this time.
0 commit comments