Skip to content

Commit 16742a3

Browse files
committed
[bugfix] Make sure to set matches correctly when there is a Wildcard Test in a predicate
1 parent f10ebf6 commit 16742a3

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

exist-core/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,6 +1276,7 @@
12761276
<exclude>src/main/java/org/exist/xquery/JavaBinding.java</exclude>
12771277
<exclude>src/test/resources-filtered/org/exist/xquery/JavaBindingTest.conf.xml</exclude>
12781278
<exclude>src/test/java/org/exist/xquery/JavaBindingTest.java</exclude>
1279+
<exclude>src/main/java/org/exist/xquery/LocationStep.java</exclude>
12791280
<exclude>src/main/java/org/exist/xquery/Materializable.java</exclude>
12801281
<exclude>src/main/java/org/exist/xquery/NameTest.java</exclude>
12811282
<exclude>src/main/java/org/exist/xquery/Optimizer.java</exclude>

exist-core/src/main/java/org/exist/xquery/LocationStep.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
* to the {@link #eval(Sequence, Item)} method) has changed.
7272
*
7373
* @author wolf
74+
* @author <a href="mailto:[email protected]">Adam Retter</a>
7475
*/
7576
public class LocationStep extends Step {
7677

@@ -526,6 +527,9 @@ private Sequence getSelf(final XQueryContext context, final Sequence contextSequ
526527
if (ns != null) {
527528
@Nullable final NodeProxy np = ns.get(p);
528529
if (np != null) {
530+
if (p.getMatches() != null) {
531+
np.addMatch(p.getMatches());
532+
}
529533
p = np;
530534
}
531535
}

0 commit comments

Comments
 (0)