Merge pull request #6392 from duncdrum/dp-fix-jetty-cont

jetty fixes II

Author: line-o

exist-core/pom.xml

@@ -1203,6 +1203,7 @@ The BaseX Team. The original license statement is also included below.]]></pream
                         <jetty.home>${project.basedir}/../exist-jetty-config/target/classes/org/exist/jetty</jetty.home>
                         <exist.configurationFile>${project.build.testOutputDirectory}/conf.xml</exist.configurationFile>
                         <exist.jetty.standalone.webapp.dir>${project.build.testOutputDirectory}/standalone-webapp</exist.jetty.standalone.webapp.dir>
+                        <exist.jetty.portal.dir>${project.basedir}/../exist-jetty-config/src/main/resources/org/exist/jetty/etc/webapps/portal</exist.jetty.portal.dir>
                         <log4j.configurationFile>${project.build.testOutputDirectory}/log4j2.xml</log4j.configurationFile>
                     </systemPropertyVariables>
 
@@ -1229,6 +1230,7 @@ The BaseX Team. The original license statement is also included below.]]></pream
                         <jetty.home>${project.basedir}/../exist-jetty-config/target/classes/org/exist/jetty</jetty.home>
                         <exist.configurationFile>${project.build.testOutputDirectory}/conf.xml</exist.configurationFile>
                         <exist.jetty.standalone.webapp.dir>${project.build.testOutputDirectory}/standalone-webapp</exist.jetty.standalone.webapp.dir>
+                        <exist.jetty.portal.dir>${project.basedir}/../exist-jetty-config/src/main/resources/org/exist/jetty/etc/webapps/portal</exist.jetty.portal.dir>
                         <log4j.configurationFile>${project.build.testOutputDirectory}/log4j2.xml</log4j.configurationFile>
                     </systemPropertyVariables>
                 </configuration>

exist-core/src/main/java/org/exist/http/servlets/HttpResponseWrapper.java

@@ -78,13 +78,25 @@ public void addCookie(final String name, final String value, final int maxAge, b
 		final Cookie cookie = new Cookie(name, encode(value));
 		cookie.setMaxAge(maxAge);
 		cookie.setSecure( secure );
-		if (domain != null) {
+		if (domain != null && !domain.isEmpty()) {
 			cookie.setDomain(domain);
 		}
-		if (path != null) {
+		setCookiePath(cookie, path);
+		response.addCookie(cookie);
+	}
+
+	/**
+	 * Apply a cookie path only when it is a non-empty string.
+	 * <p>
+	 * Standalone Jetty deployments use a root context ({@code getContextPath()} returns {@code ""}).
+	 * Passing that empty string as an explicit Path makes many HTTP clients (including Apache HttpClient
+	 * used in integration tests) reject the cookie entirely. Omitting Path lets the container apply
+	 * the RFC 6265 default for the request URI.
+	 */
+	private static void setCookiePath(final Cookie cookie, final String path) {
+		if (path != null && !path.isEmpty()) {
 			cookie.setPath(path);
 		}
-		response.addCookie(cookie);
 	}
 
 	@Override

exist-core/src/main/java/org/exist/indexing/IndexController.java

@@ -40,7 +40,9 @@
 import org.w3c.dom.NodeList;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import org.exist.security.PermissionDeniedException;
@@ -56,7 +58,14 @@ public enum CollectionIndexRemovalMode {
         CONFIG_ONLY_REINDEX
     }
 
-    private final Map<String, IndexWorker> indexWorkers = new HashMap<>();
+    /**
+     * Stable iteration order for listener chains and {@link #flush()}.
+     */
+    private static final Comparator<IndexWorker> INDEX_WORKER_ORDER = Comparator
+            .comparingInt(IndexWorker::getChainPriority)
+            .thenComparing(IndexWorker::getIndexId);
+
+    private final Map<String, IndexWorker> indexWorkers = new LinkedHashMap<>();
 
     private final DBBroker broker;
     private StreamListener listener = null;
@@ -68,9 +77,9 @@ public enum CollectionIndexRemovalMode {
     public IndexController(final DBBroker broker) {
         this.broker = broker;
         final List<IndexWorker> workers = broker.getBrokerPool().getIndexManager().getWorkers(broker);
-        for (final IndexWorker worker : workers) {
-            indexWorkers.put(worker.getIndexId(), worker);
-        }
+        workers.stream()
+                .sorted(INDEX_WORKER_ORDER)
+                .forEach(worker -> indexWorkers.put(worker.getIndexId(), worker));
     }
 
     /**

exist-core/src/main/java/org/exist/indexing/IndexWorker.java

@@ -53,6 +53,24 @@ public interface IndexWorker {
      */	
     public static final String VALUE_COUNT = "value_count";
 
+    /**
+     * Lower values run earlier in {@link IndexController} listener chains and {@link #flush()}.
+     * Gaps reserve room for future workers: {@code 0} structural, {@code 1–99} pre-statistics,
+     * {@code 100–999} pre-Lucene, {@code 1000+} Lucene and later; unranked workers use
+     * {@link Integer#MAX_VALUE}.
+     */
+    int CHAIN_PRIORITY_STRUCTURAL = 0;
+    int CHAIN_PRIORITY_STATISTICS = 100;
+    int CHAIN_PRIORITY_LUCENE = 1000;
+
+    /**
+     * Chain-order priority for {@link IndexController}. Default {@link Integer#MAX_VALUE} preserves
+     * legacy ordering among workers that do not override.
+     */
+    default int getChainPriority() {
+        return Integer.MAX_VALUE;
+    }
+
     /**
      * Returns an ID which uniquely identifies this worker's index.
      * @return a unique name identifying this worker's index.