[FIX] XQuery: Repeated evaluation of nondeterministic code. Closes #2395

Author: ChristianGruen

basex-core/src/main/java/org/basex/query/func/DynFuncCall.java

@@ -145,7 +145,7 @@ FItem evalFunc(final QueryContext qc) throws QueryException {
   public boolean has(final Flag... flags) {
     if(Flag.UPD.oneOf(flags) && (updating || sc().mixUpdates)) return true;
     if(Flag.NDT.oneOf(flags) && (ndt || updating || sc().mixUpdates)) return true;
-    final Flag[] flgs = Flag.remove(flags, Flag.NDT, Flag.UPD);
+    final Flag[] flgs = Flag.remove(flags, Flag.UPD);
     return flgs.length != 0 && super.has(flgs);
   }
 

basex-core/src/test/java/org/basex/query/ast/RewritingsTest.java

@@ -3370,4 +3370,10 @@ private static String gh1852(final String query) {
   @Test public void gh2390() {
     query("<p><b/></p>/*[.[self::a union self::b/@x]]", "");
   }
+
+  /** Repeated evaluation of nondeterministic code. */
+  @Test public void gh2395() {
+    query("count(distinct-values((1 to 5) ! prof:track((1 to 1000000)[. = 0])?time)) > 1",
+        true);
+  }
 }