fix NPE in comparator

(cherry picked from commit 727a566ad55100023d613b98bb69f7ee21891be3)

asie-api/pom.xml

@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>com.inteligr8.alfresco</groupId>
 		<artifactId>asie-platform-module-parent</artifactId>
-		<version>1.3.6</version>
+		<version>1.3-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
 	<artifactId>asie-api</artifactId>
-	<version>1.1.2-asie2</version>
+	<version>1.2-SNAPSHOT-asie2</version>
 	<packaging>jar</packaging>
 	
 	<name>ASIE Jakarta RS API</name>
@@ -33,7 +33,7 @@
 		<dependency>
 			<groupId>com.inteligr8</groupId>
 			<artifactId>solr-api</artifactId>
-			<version>1.1.0-solr6</version>
+			<version>1.2-SNAPSHOT-solr6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.alfresco</groupId>
@@ -53,7 +53,7 @@
 		<dependency>
 			<groupId>org.glassfish.jersey.inject</groupId>
 			<artifactId>jersey-hk2</artifactId>
-			<version>3.1.10</version>
+			<version>4.0.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -84,7 +84,7 @@
 	<repositories>
 		<repository>
 			<id>alfresco-public</id>
-			<url>https://artifacts.alfresco.com/nexus/repository/public/</url>
+			<url>https://artifacts.alfresco.com/nexus/repository/releases/</url>
 		</repository>
 	</repositories>
 </project>

community-module/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.inteligr8.alfresco</groupId>
 		<artifactId>asie-platform-module-parent</artifactId>
-		<version>1.2.2</version>
+		<version>1.3-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
@@ -16,10 +16,10 @@
 	<name>ASIE Platform Module for ACS Community</name>
 
 	<properties>
-		<alfresco.sdk.version>4.9.0</alfresco.sdk.version>
-		<alfresco.platform.version>23.3.0</alfresco.platform.version>
-		<alfresco.platform.war.version>23.3.0.98</alfresco.platform.war.version>
-		<tomcat-rad.version>10-2.1</tomcat-rad.version>
+		<alfresco.sdk.version>4.16.0</alfresco.sdk.version>
+		<alfresco.platform.version>26.1.0</alfresco.platform.version>
+		<alfresco.platform.war.version>26.1.0.61</alfresco.platform.war.version>
+		<tomcat-rad.version>2.3-tomcat-11.0.22</tomcat-rad.version>
 		
 		<beedk.rad.acs-search.enabled>true</beedk.rad.acs-search.enabled>
 	</properties>
@@ -59,7 +59,7 @@
 		<dependency>
 			<groupId>com.inteligr8.alfresco</groupId>
 			<artifactId>cxf-jaxrs-platform-module</artifactId>
-			<version>1.3.1-acs-v23.3</version>
+			<version>1.4.0-acs-v26.1</version>
 			<type>amp</type>
 		</dependency>
 
@@ -81,7 +81,6 @@
 			<plugin>
 				<groupId>io.repaint.maven</groupId>
 				<artifactId>tiles-maven-plugin</artifactId>
-				<version>2.40</version>
 				<extensions>true</extensions>
 				<configuration>
 					<tiles>
@@ -100,7 +99,7 @@
 	<repositories>
 		<repository>
 			<id>alfresco-public</id>
-			<url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
+			<url>https://artifacts.alfresco.com/nexus/repository/releases/</url>
 		</repository>
 	</repositories>
 </project>

enterprise-module/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.inteligr8.alfresco</groupId>
 		<artifactId>asie-platform-module-parent</artifactId>
-		<version>1.3.6</version>
+		<version>1.3-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
@@ -16,9 +16,10 @@
 	<name>ASIE Platform Module for ACS Enterprise</name>
 
 	<properties>
-		<alfresco.platform.version>25.1.0</alfresco.platform.version>
-		<alfresco.platform.war.version>25.1.0.71</alfresco.platform.war.version>
-		<tomcat-rad.version>2.3-tomcat-10.1.52</tomcat-rad.version>
+		<alfresco.platform.version>26.1.0</alfresco.platform.version>
+		<alfresco.platform.war.version>26.1.0.61</alfresco.platform.war.version>
+		<tomcat-rad.version>2.3-tomcat-11.0.22</tomcat-rad.version>
+		<jackson.version>2.17.2</jackson.version>
 		
 		<beedk.rad.acs-search.enabled>true</beedk.rad.acs-search.enabled>
 	</properties>
@@ -40,7 +41,7 @@
 		<dependency>
 			<groupId>com.inteligr8.alfresco</groupId>
 			<artifactId>cxf-jaxrs-platform-module</artifactId>
-			<version>1.4.0-acs-v25.1</version>
+			<version>1.4.0-acs-v26.1</version>
 			<type>amp</type>
 			<scope>provided</scope>
 		</dependency>
@@ -74,13 +75,13 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-jsr310</artifactId>
-			<version>2.17.3</version>
+			<version>${jackson.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.module</groupId>
 			<artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
-			<version>2.17.2</version>
+			<version>${jackson.version}</version>
 			<scope>provided</scope>
 		</dependency>
 

enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise/service/ShardDiscoveryService.java

@@ -264,7 +264,7 @@ public class ShardDiscoveryService implements com.inteligr8.alfresco.asie.spi.Sh
 				ShardInstanceState nodeShardState = ShardInstanceState.from(shardState);
 				
 				Pair<SolrHost, ShardInstanceState> pair = new Pair<>(node, nodeShardState);
-				if (comparator.compare(pair, shardNodeStates.get(shardId)) < 0)
+				if (!shardNodeStates.containsKey(shardId) || comparator.compare(pair, shardNodeStates.get(shardId)) < 0)
 					shardNodeStates.put(shardId, pair);
 			}
 		}

pom.xml

@@ -5,7 +5,7 @@
 	
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>asie-platform-module-parent</artifactId>
-	<version>1.3.6</version>
+	<version>1.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>ASIE Platform Module Parent</name>
@@ -47,9 +47,9 @@
 		<!-- must be aligned with the target ACS platform junit -->
 		<junit.version>5.12.2</junit.version>
 		
-		<commom-rest-client.base.version>3.0.3</commom-rest-client.base.version>
+		<commom-rest-client.base.version>3.0.4</commom-rest-client.base.version>
 		
-		<alfresco.platform.version>25.1.0</alfresco.platform.version>
+		<alfresco.platform.version>26.1.0</alfresco.platform.version>
 	</properties>
 	
 	<dependencyManagement>
@@ -68,7 +68,7 @@
 				<!-- helps avoid vulnerable dependencies -->
 				<plugin>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>3.21.0</version>
+					<version>3.22.0</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-compiler-plugin</artifactId>
@@ -76,12 +76,12 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-dependency-plugin</artifactId>
-					<version>3.10.0</version>
+					<version>3.11.0</version>
 				</plugin>
 				
 				<plugin>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.5.5</version>
+					<version>3.5.6</version>
 					<dependencies>
 						<dependency>
 							<groupId>org.junit.jupiter</groupId>
@@ -92,7 +92,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>3.5.5</version>
+					<version>3.5.6</version>
 					<dependencies>
 						<dependency>
 							<groupId>org.junit.jupiter</groupId>
@@ -105,7 +105,7 @@
 				<plugin>
 					<groupId>io.repaint.maven</groupId>
 					<artifactId>tiles-maven-plugin</artifactId>
-					<version>2.43</version>
+					<version>2.45</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -162,7 +162,7 @@
 					<plugin>
 						<groupId>org.sonatype.central</groupId>
 						<artifactId>central-publishing-maven-plugin</artifactId>
-						<version>0.8.0</version>
+						<version>0.10.0</version>
 						<extensions>true</extensions>
 						<configuration>
 							<publishingServerId>central</publishingServerId>

shared/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.inteligr8.alfresco</groupId>
 		<artifactId>asie-platform-module-parent</artifactId>
-		<version>1.3.6</version>
+		<version>1.3-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
@@ -16,7 +16,7 @@
 	<name>ASIE Shared Library for Platform Modules</name>
 
 	<properties>
-		<alfresco.sdk.version>4.9.0</alfresco.sdk.version>
+		<alfresco.sdk.version>4.16.0</alfresco.sdk.version>
 		
 		<common-rest-client.version>${commom-rest-client.base.version}-cxf</common-rest-client.version>
 	</properties>
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>com.inteligr8.alfresco</groupId>
 			<artifactId>asie-api</artifactId>
-			<version>1.1.1-asie2</version>
+			<version>1.2-SNAPSHOT-asie2</version>
 		</dependency>
 		<dependency>
 			<groupId>com.inteligr8</groupId>
@@ -73,7 +73,7 @@
 	<repositories>
 		<repository>
 			<id>alfresco-public</id>
-			<url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
+			<url>https://artifacts.alfresco.com/nexus/repository/releases/</url>
 		</repository>
 	</repositories>
 </project>

shared/src/main/java/com/inteligr8/alfresco/asie/rest/ReconcileAcsNodesWebScript.java

@@ -44,10 +44,10 @@ public class ReconcileAcsNodesWebScript extends AbstractAsieWebScript {
 			public void reconciled(long nodeDbId) {
 				if (includeReconciled) {
 					@SuppressWarnings("unchecked")
-					List<Long> unreconciledNodeDbIds = (List<Long>) responseMap.get("reconciled");
-					if (unreconciledNodeDbIds == null)
-						responseMap.put("reconciled", unreconciledNodeDbIds = new LinkedList<>());
-					unreconciledNodeDbIds.add(nodeDbId);
+					List<Long> reconciledNodeDbIds = (List<Long>) responseMap.get("reconciled");
+					if (reconciledNodeDbIds == null)
+						responseMap.put("reconciled", reconciledNodeDbIds = new LinkedList<>());
+					reconciledNodeDbIds.add(nodeDbId);
 				}
 			}
 			

shared/src/main/java/com/inteligr8/alfresco/asie/service/AbstractNodeActionService.java

@@ -232,10 +232,6 @@ public abstract class AbstractNodeActionService implements DisposableBean {
 	private List<com.inteligr8.alfresco.asie.model.ShardInstance> findPossibleShardInstances(long nodeDbId) {
 		if (this.shardRegistry == null)
 			throw new UnsupportedOperationException("ACS instances without a sharding configuration are not yet implemented");
-		
-//		SearchParameters searchParams = new SearchParameters();
-//		searchParams.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
-//		searchParams.setQuery("@" + this.formatForFts(ContentModel.PROP_NODE_DBID) + ":" + nodeDbId);
 
 		List<com.inteligr8.alfresco.asie.model.ShardInstance> instances = new LinkedList<>();
 		

shared/src/main/java/com/inteligr8/alfresco/asie/service/AcsReconcileService.java

@@ -59,7 +59,7 @@ public class AcsReconcileService implements DisposableBean {
 	
 	@Autowired
 	private ReindexService reindexService;
-	
+
 	@Autowired
 	private ExecutorManager executorManager;
 	
@@ -75,6 +75,12 @@ public class AcsReconcileService implements DisposableBean {
 	@Value("${inteligr8.asie.reconciliation.concurrency}")
 	private int concurrency;
 	
+	@Value("${inteligr8.asie.reconciliation.waitAfterSolrNodeActionMillis}")
+	private long waitAfterSolrNodeActionMillis;
+
+	@Value("${inteligr8.asie.reconciliation.waitAfterSolrNodeReconcileMillis}")
+	private long waitAfterSolrNodeReconcileMillis;
+	
 	@Override
 	public void destroy() {
 		ExecutorService executor = this.executorManager.get("solr-reconcile");
@@ -100,7 +106,7 @@ public class AcsReconcileService implements DisposableBean {
 	 * 
 	 * There are two sets of parameters regarding timeouts.  The queue timeouts
 	 * are for how long the requesting thread should wait for a full queue to
-	 * open up space for new re-index executions.  The execution timeouts are
+	 * open up space for new reconcile executions.  The execution timeouts are
 	 * for how long the execution should be allowed to take once dequeued.
 	 * There is no timeout for how long the execution is queued.
 	 * 
@@ -111,10 +117,10 @@ public class AcsReconcileService implements DisposableBean {
 	 * @param callback A callback to process multiple returned values from the re-index.
 	 * @param queueTimeout A timeout for how long the calling thread should wait for space on the queue.
 	 * @param queueUnit The time units for the `queueTimeout`.
-	 * @param execTimeout A timeout for the elapsed time the reindex execution should take when dequeued.
+	 * @param execTimeout A timeout for the elapsed time the reconcile execution should take when dequeued.
 	 * @param execUnit The time units for the `execTimeout`.
 	 * @throws TimeoutException Either the queue or execution timeout lapsed. 
-	 * @throws InterruptedException The re-index was interrupted (server shutdown).
+	 * @throws InterruptedException The reconciliation was interrupted (server shutdown).
 	 */
 	public void reconcile(
 			long fromDbId, long toDbId, Integer nodesChunkSize,
@@ -123,18 +129,10 @@ public class AcsReconcileService implements DisposableBean {
 			ReconcileCallback callback,
 			long queueTimeout, TimeUnit queueUnit,
 			long execTimeout, TimeUnit execUnit) throws InterruptedException, TimeoutException {
-		if (nodesChunkSize == null)
-			nodesChunkSize = this.nodesChunkSize;
 		if (this.logger.isTraceEnabled())
 			this.logger.trace("reconcile({}, {}, {}, {}, {}, {}, {})", fromDbId, toDbId, nodesChunkSize, indexUnreconciled, reindexReconciled, queueUnit.toMillis(queueTimeout), execUnit.toMillis(execTimeout));
-
-		CompositeFuture<Void> future = new CompositeFuture<>();
 		
-		for (long startDbId = fromDbId; startDbId < toDbId; startDbId += nodesChunkSize) {
-			long endDbId = Math.min(toDbId, startDbId + nodesChunkSize);
-			future.combine(this.reconcileChunk(startDbId, endDbId, indexUnreconciled, reindexReconciled, callback, queueTimeout, queueUnit, execTimeout, execUnit));
-			future.purge(true);
-		}
+		Future<Void> future = this._reconcile(fromDbId, toDbId, nodesChunkSize, indexUnreconciled, reindexReconciled, callback, queueTimeout, queueUnit, execTimeout, execUnit);
 		
 		try {
 			future.get(execTimeout, execUnit);
@@ -143,27 +141,52 @@ public class AcsReconcileService implements DisposableBean {
 		}
 	}
 	
+	/**
+	 * This method reconciles the specified node range between ACS and Solr.
+	 * The node range is specified using the ACS unique database identifiers.
+	 * There is no other reasonably efficient attack vector.  The callback
+	 * handles all the return values.  This is the synchronous alternative to
+	 * the other `reconcile` method.
+	 * 
+	 * @param fromDbId A node database ID, inclusive.
+	 * @param toDbId A node database ID, exclusive.
+	 * @param indexUnreconciled For nodes not found in Solr, attempt to index against all applicable Solr instances.
+	 * @param reindexReconciled For nodes found in Solr, attempt to re-index against all applicable Solr instances.
+	 * @param callback A callback to process multiple returned values from the re-index.
+	 * @throws InterruptedException The reconciliation was interrupted (server shutdown).
+	 */
 	public Future<Void> reconcile(
 			long fromDbId, long toDbId, Integer nodesChunkSize,
 			boolean indexUnreconciled,
 			boolean reindexReconciled,
 			ReconcileCallback callback) throws InterruptedException {
-		if (nodesChunkSize == null)
-			nodesChunkSize = this.nodesChunkSize;
 		this.logger.trace("reconcile({}, {}, {}, {}, {})", fromDbId, toDbId, nodesChunkSize, indexUnreconciled, reindexReconciled);
 
-		CompositeFuture<Void> future = new CompositeFuture<>();
-		
 		try {
-			for (long startDbId = fromDbId; startDbId < toDbId; startDbId += nodesChunkSize) {
-				long endDbId = Math.min(toDbId, startDbId + nodesChunkSize);
-				future.combine(this.reconcileChunk(startDbId, endDbId, indexUnreconciled, reindexReconciled, callback, -1L, null, -1L, null));
-				future.purge(true);
-			}
+			return this._reconcile(fromDbId, toDbId, nodesChunkSize, indexUnreconciled, reindexReconciled, callback, -1L, null, -1L, null);
 		} catch (TimeoutException te) {
 			throw new RuntimeException("This should never happen: " + te.getMessage(), te);
 		}
+	}
+
+	protected Future<Void> _reconcile(
+			long fromDbId, long toDbId, Integer nodesChunkSize,
+			boolean indexUnreconciled,
+			boolean reindexReconciled,
+			ReconcileCallback callback,
+			long queueTimeout, TimeUnit queueUnit,
+			long execTimeout, TimeUnit execUnit) throws InterruptedException, TimeoutException {
+		if (nodesChunkSize == null)
+			nodesChunkSize = this.nodesChunkSize;
 		
+		CompositeFuture<Void> future = new CompositeFuture<>();
+		
+		for (long startDbId = fromDbId; startDbId < toDbId; startDbId += nodesChunkSize) {
+			long endDbId = Math.min(toDbId, startDbId + nodesChunkSize);
+			future.combine(this.reconcileChunk(startDbId, endDbId, indexUnreconciled, reindexReconciled, callback, queueTimeout, queueUnit, execTimeout, execUnit));
+			future.purge(true);
+		}
+
 		return future;
 	}
 	
@@ -216,6 +239,7 @@ public class AcsReconcileService implements DisposableBean {
 			this.logger.trace("Attempting to reconcile ACS node: {}", nodeDbId);
 
 			Callable<Void> callable;
+			boolean callingSolr = false;
 
 			final int dbIdIndex = (int) (nodeDbId - fromDbId);
 			if (nodeRefs[dbIdIndex] != null) {
@@ -235,6 +259,8 @@ public class AcsReconcileService implements DisposableBean {
 						return null;
 					}
 				};
+				if (reindexReconciled)
+					callingSolr = true;
 			} else {
 				callable = new Callable<Void>() {
 					@Override
@@ -243,6 +269,7 @@ public class AcsReconcileService implements DisposableBean {
 						return null;
 					}
 				};
+				callingSolr = true;
 			}
 			
 			if (queueTimeout < 0L) {
@@ -250,36 +277,42 @@ public class AcsReconcileService implements DisposableBean {
 			} else {
 				future.combine(executor.submit(callable, queueTimeout, queueUnit));
 			}
+
+			if (callingSolr && this.waitAfterSolrNodeReconcileMillis > 0L) {
+				this.logger.trace("Waiting between each node reconcile");
+				Thread.sleep(this.waitAfterSolrNodeReconcileMillis);
+			}
 		}
 		
 		return future;
 	}
 	
-	public void reconcile(long nodeDbId,
+	public boolean reconcile(long nodeDbId,
 			boolean index,
 			ReconcileCallback callback) throws InterruptedException, TimeoutException {
 		NodeRef nodeRef = this.nodeService.getNodeRef(nodeDbId);
 		if (nodeRef == null) {
 			this.logger.trace("No such ACS node: {}; skipping ...", nodeDbId);
-			return;
+			return false;
 		}
 		
 		if (!StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.equals(nodeRef.getStoreRef())) {
 			this.logger.trace("A deliberately ignored store in the DB is not indexed in Solr: {}: {}", nodeDbId, nodeRef);
-			return;
+			return false;
 		}
 
 		Set<QName> aspects = this.nodeService.getAspects(nodeRef);
 		aspects.retainAll(this.ignoreNodesWithAspects);
 		if (!aspects.isEmpty()) {
 			this.logger.trace("A deliberately ignored node in the DB is not indexed in Solr: {}: {}: {}", nodeDbId, nodeRef, aspects);
-			return;
+			return false;
 		}
 		
 		if (!index) {
 			this.logger.debug("A node in the DB is not indexed in Solr: {}: {}", nodeDbId, nodeRef);
 			this.reconcileLogger.info("UNRECONCILED: {} <=> {}", nodeDbId, nodeRef);
 			callback.unreconciled(nodeDbId);
+			return false;
 		} else {
 			this.logger.debug("A node in the DB is not indexed in Solr; attempt to index: {}: {}", nodeDbId, nodeRef);
 			this.index(nodeDbId, nodeRef, callback);
@@ -287,6 +320,7 @@ public class AcsReconcileService implements DisposableBean {
 			// its results will be logged
 			// the reconcile thread will continue independently
 			// the callback will lag
+			return true;
 		}
 	}
 	
@@ -321,7 +355,13 @@ public class AcsReconcileService implements DisposableBean {
 			}
 		};
 		
-		return this.indexService.index(nodeDbId, indexCallback);
+		Future<Void> future = this.indexService.index(nodeDbId, indexCallback);
+		
+		if (this.waitAfterSolrNodeActionMillis > 0L) {
+			Thread.sleep(this.waitAfterSolrNodeActionMillis);
+		}
+
+		return future;
 	}
 	
 	public Future<Void> reindex(long nodeDbId, NodeRef nodeRef, ReconcileCallback callback) throws InterruptedException {
@@ -355,7 +395,13 @@ public class AcsReconcileService implements DisposableBean {
 			}
 		};
 
-		return this.reindexService.reindex(nodeDbId, reindexCallback);
+		Future<Void> future = this.reindexService.reindex(nodeDbId, reindexCallback);
+		
+		if (this.waitAfterSolrNodeActionMillis > 0L) {
+			Thread.sleep(this.waitAfterSolrNodeActionMillis);
+		}
+
+		return future;
 	}
 	
 	private String formatForFts(QName qname) {

shared/src/main/java/com/inteligr8/alfresco/asie/service/ExecutorManager.java

@@ -32,7 +32,7 @@ import com.inteligr8.alfresco.asie.util.ThrottledThreadPoolExecutor;
  */
 @Component
 public class ExecutorManager implements InitializingBean, DisposableBean, RemovalListener<String, ExecutorService> {
-	
+
 	private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
 	@Value("${inteligr8.asie.executors.expireTimeInMinutes}")

shared/src/main/java/com/inteligr8/alfresco/asie/service/SolrShardHashService.java

@@ -72,7 +72,7 @@ public class SolrShardHashService {
 					this.logger.debug("Unable to determine shard instance ID because property does not exist on node: {}: {}", nodeRef, hashableProperty);
 					return -1;
 				}
-				
+
 				this.logger.trace("Discovered node property for sharding: {} => {}", nodeRef, fullPropertyValue);
 
 				String hashableValue = null;

shared/src/main/java/com/inteligr8/alfresco/asie/spi/ShardDiscoveryService.java

@@ -125,7 +125,9 @@ public interface ShardDiscoveryService {
 	public class ShardedNodeShardStateComparator implements Comparator<Pair<SolrHost, ShardInstanceState>> {
 		@Override
 		public int compare(Pair<SolrHost, ShardInstanceState> p1, Pair<SolrHost, ShardInstanceState> p2) {
-			return - Long.compare(p1.getSecond().getLastIndexedTxId(), p2.getSecond().getLastIndexedTxId());
+			if (p1 == null) return 1;
+			else if (p2 == null) return -1;
+			else return - Long.compare(p1.getSecond().getLastIndexedTxId(), p2.getSecond().getLastIndexedTxId());
 		}
 	}
 

shared/src/main/java/com/inteligr8/alfresco/asie/util/CompositeFuture.java

@@ -79,12 +79,14 @@ public class CompositeFuture<T> implements Future<T> {
 		List<T> results = new ArrayList<>(this.futures.size());
 		for (Future<T> future : this.futures) {
 			if (future instanceof RunnableFuture<?>) {
-				this.logger.debug("Waiting {} ms since the start of the execution of the future to complete", unit.toMillis(timeout));
+				this.logger.trace("Waiting {} ms since the start of the exectuion of the future to complete", unit.toMillis(timeout));
 				results.add(((RunnableFuture<T>) future).get(timeout, unit));
+				this.logger.trace("Exectuion completed", unit.toMillis(timeout));
 			} else {
 				long remainingTimeMillis = expireTimeMillis - System.currentTimeMillis();
-				this.logger.debug("Waiting {} ms for the future to complete", remainingTimeMillis);
+				this.logger.trace("Waiting {} ms for the future to complete", remainingTimeMillis);
 				results.add(future.get(remainingTimeMillis, TimeUnit.MILLISECONDS));
+				this.logger.trace("Exectuion completed", unit.toMillis(timeout));
 			}
 		}
 		
@@ -131,14 +133,24 @@ public class CompositeFuture<T> implements Future<T> {
 			Future<T> future = i.next();
 			if (future.isCancelled()) {
 				if (includeCancelled) {
+					this.logger.trace("Removing cancelled future");
 					removedCancelled++;
 					i.remove();
 				} else {
 					remain++;
 				}
 			} else if (future.isDone()) {
-				removedDone++;
-				i.remove();
+				try {
+					future.get();
+				} catch (InterruptedException ie) {
+					this.logger.trace("Future completed because it was interrupted");
+				} catch (ExecutionException ee) {
+					this.logger.error(ee.getMessage(), ee);
+				} finally {
+					this.logger.trace("Removing completed future");
+					removedDone++;
+					i.remove();
+				}
 			} else if (future instanceof CompositeFuture<?>) {
 				cfutures.add((CompositeFuture<?>) future);
 			} else {

shared/src/main/resources/alfresco/module/com_inteligr8_alfresco_asie-shared/alfresco-global.properties

@@ -19,6 +19,8 @@ inteligr8.asie.reconciliation.nodesChunkSize=250
 inteligr8.asie.reconciliation.nodeTimeoutSeconds=10
 inteligr8.asie.reconciliation.concurrentQueueSize=32
 inteligr8.asie.reconciliation.concurrency=2
+inteligr8.asie.reconciliation.waitAfterSolrNodeActionMillis=0
+inteligr8.asie.reconciliation.waitAfterSolrNodeReconcileMillis=0
 
 # Action (like indexing and re-indexing) configuration
 inteligr8.asie.default.concurrentQueueSize=32

solr-api/pom.xml

@@ -6,31 +6,31 @@
 	<parent>
 		<groupId>com.inteligr8.alfresco</groupId>
 		<artifactId>asie-platform-module-parent</artifactId>
-		<version>1.3.6</version>
+		<version>1.3-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
 	<groupId>com.inteligr8</groupId>
 	<artifactId>solr-api</artifactId>
-	<version>1.1.0-solr6</version>
+	<version>1.2-SNAPSHOT-solr6</version>
 	<packaging>jar</packaging>
 	
 	<name>Apache Solr Jakarta RS API</name>
 
 	<properties>
-		<jackson.version>2.21.1</jackson.version>
+		<jackson.version>2.22.1</jackson.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>jakarta.annotation</groupId>
 			<artifactId>jakarta.annotation-api</artifactId>
-			<version>2.1.1</version>
+			<version>3.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.ws.rs</groupId>
 			<artifactId>jakarta.ws.rs-api</artifactId>
-			<version>3.1.0</version>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.module</groupId>