Merge pull request #4497 from evolvedbinary/hotfix/empty-sequence-skipping

Author: dizzzz

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

@@ -193,4 +193,8 @@ public Expression simplify() {
         return this;
     }
 
+    @Override
+    public boolean evalNextExpressionOnEmptyContextSequence() {
+        return true;
+    }
 }

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

@@ -229,7 +229,8 @@ public Sequence eval(Sequence contextSequence, final Item contextItem) throws XP
             //TODO : let the parser do it ? -pb
             boolean gotAtomicResult = false;
             Expression prev = null;
-            for (final Expression step : steps) {
+            for (int stepIdx = 0; stepIdx < steps.size(); stepIdx++) {
+                final Expression step = steps.get(stepIdx);
                 prev = expr;
                 expr = step;
                 context.getWatchDog().proceed(expr);
@@ -313,7 +314,7 @@ public Sequence eval(Sequence contextSequence, final Item contextItem) throws XP
                      * return true when {@link Expression#evalNextExpressionOnEmptyContextSequence()}
                      * is called to indicate that.
                      */
-                    if (result.isEmpty() && !step.evalNextExpressionOnEmptyContextSequence()) {
+                    if (result.isEmpty() && stepIdx < steps.size() - 1 && !step.evalNextExpressionOnEmptyContextSequence()) {
                         break;
                     }
                 }

exist-core/src/test/java/org/exist/xquery/XQueryFunctionsTest.java

@@ -1030,4 +1030,29 @@ public void defaultLanguage() throws XMLDBException {
         final String defaultLanguage = (String) result.getResource(0).getContent();
         assertEquals(Locale.getDefault().getLanguage(), defaultLanguage);
     }
+
+    @Test
+    public void enclosedExpression() throws XMLDBException {
+        ResourceSet result = existEmbeddedServer.executeQuery("<abc>{()}{123}</abc>");
+        assertEquals(1, result.getSize());
+        String text = (String) result.getResource(0).getContent();
+        assertEquals("<abc>123</abc>", text);
+
+        result = existEmbeddedServer.executeQuery("<abc>{(), 123}</abc>");
+        assertEquals(1, result.getSize());
+        text = (String) result.getResource(0).getContent();
+        assertEquals("<abc>123</abc>", text);
+
+        result = existEmbeddedServer.executeQuery("<abc>{()}123</abc>");
+        assertEquals(1, result.getSize());
+        text = (String) result.getResource(0).getContent();
+        assertEquals("<abc>123</abc>", text);
+
+        result = existEmbeddedServer.executeQuery("<root>{'time '}{()}{'is: '}{current-time()}</root>");
+        assertEquals(1, result.getSize());
+        text = (String) result.getResource(0).getContent();
+        assertTrue(text.startsWith("<root>time is: "));
+        assertTrue(text.length() > 35);
+        assertTrue(text.endsWith("</root>"));
+    }
 }