diff --git a/exist-core/src/main/java/org/exist/xquery/LetExpr.java b/exist-core/src/main/java/org/exist/xquery/LetExpr.java index 50f08b6014..48dbf4bd58 100644 --- a/exist-core/src/main/java/org/exist/xquery/LetExpr.java +++ b/exist-core/src/main/java/org/exist/xquery/LetExpr.java @@ -108,6 +108,10 @@ public Sequence eval(Sequence contextSequence, Item contextItem) var.setContextDocs(inputSequence.getContextDocSet()); registerUpdateListener(in); + if (getPreviousClause() == null && returnExpr instanceof FLWORClause flworClause) { + flworClause.preEval(in); + } + resultSequence = returnExpr.eval(contextSequence, null); if (sequenceType != null) { @@ -173,14 +177,14 @@ public Sequence eval(Sequence contextSequence, Item contextItem) clearContext(getExpressionId(), in); if (context.getProfiler().isEnabled()) {context.getProfiler().end(this, "", resultSequence);} + if (getPreviousClause() == null) { + resultSequence = postEval(resultSequence); + } if (resultSequence == null) {return Sequence.EMPTY_SEQUENCE;} if (!(resultSequence instanceof DeferredFunctionCall)) { setActualReturnType(resultSequence.getItemType()); } - if (getPreviousClause() == null) { - resultSequence = postEval(resultSequence); - } return resultSequence; } finally { context.popDocumentContext();