Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ protected ModuleCall(final ModuleCall other) {
@Override
public void doRewrite(final HttpServletRequest request, final HttpServletResponse response) throws ServletException {
try {
final ContextItemDeclaration cid = call.getContext().getContextItemDeclartion();
final ContextItemDeclaration cid = call.getContext().getContextItemDeclaration();
final Sequence contextSequence;
if (cid != null) {
contextSequence = cid.eval(null, null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ protected void runScript(Subject subject, String scriptURI, String script, QName
}

final Sequence contextSequence;
final ContextItemDeclaration cid = context.getContextItemDeclartion();
final ContextItemDeclaration cid = context.getContextItemDeclaration();
if(cid != null) {
contextSequence = cid.eval(null, null);
} else {
Expand Down
2 changes: 1 addition & 1 deletion exist-core/src/main/java/org/exist/xquery/RootNode.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public Sequence eval(Sequence contextSequence, Item contextItem) throws XPathExc
}

// second, check if a context item is declared
final ContextItemDeclaration decl = context.getContextItemDeclartion();
final ContextItemDeclaration decl = context.getContextItemDeclaration();
if (decl != null) {
final Sequence seq = decl.eval(null, null);
if (!seq.isEmpty()) {
Expand Down
4 changes: 2 additions & 2 deletions exist-core/src/main/java/org/exist/xquery/XQuery.java
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,8 @@ public Sequence execute(final DBBroker broker, final CompiledXQuery expression,

// support for XQuery 3.0 - declare context item :=
if(contextSequence == null) {
if(context.getContextItemDeclartion() != null) {
contextSequence = context.getContextItemDeclartion().eval(null, null);
if(context.getContextItemDeclaration() != null) {
contextSequence = context.getContextItemDeclaration().eval(null, null);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ public void setContextItemDeclaration(final ContextItemDeclaration contextItemDe
this.contextItemDeclaration = contextItemDeclaration;
}

public ContextItemDeclaration getContextItemDeclartion() {
public ContextItemDeclaration getContextItemDeclaration() {
return contextItemDeclaration;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@

import org.exist.dom.QName;
import org.exist.dom.persistent.ElementImpl;
import org.exist.dom.persistent.NodeImpl;
import org.exist.storage.ElementValue;
import org.exist.storage.NodePath;
import org.exist.util.DatabaseConfigurationException;
Expand Down Expand Up @@ -414,7 +413,7 @@ private AtomicValue findAtomicValue(final Expression expr) {
}

try {
final ContextItemDeclaration cid = expr.getContext().getContextItemDeclartion();
final ContextItemDeclaration cid = expr.getContext().getContextItemDeclaration();
final Sequence result;
if (cid == null) {
result = expr.eval(null, null);
Expand Down
Loading