From 0d566b88b0cde778209a1cc9eb396bc86ea07818 Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Wed, 30 Sep 2020 22:43:53 +0200
Subject: [PATCH] Update pom.xml, CompletableFutureUtils.java, and
 FloatPriorityQueue.java

---
 pom.xml                                                       | 2 +-
 .../concurrency/future/CompletableFutureUtils.java            | 4 ++--
 .../java/org/warp/commonutils/type/FloatPriorityQueue.java    | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 27e6d4d..620e16e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.jetbrains</groupId>
       <artifactId>annotations</artifactId>
-      <version>17.0.0</version>
+      <version>19.0.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
diff --git a/src/main/java/org/warp/commonutils/concurrency/future/CompletableFutureUtils.java b/src/main/java/org/warp/commonutils/concurrency/future/CompletableFutureUtils.java
index 9339e76..fc28d5f 100644
--- a/src/main/java/org/warp/commonutils/concurrency/future/CompletableFutureUtils.java
+++ b/src/main/java/org/warp/commonutils/concurrency/future/CompletableFutureUtils.java
@@ -184,8 +184,8 @@ public class CompletableFutureUtils {
 	public static <T> CompletableFuture<FloatPriorityQueue<T>> aggregatePq(Collection<CompletableFuture<FloatPriorityQueue<T>>> futureFloatPriorityQueues) {
 		final CompletableFuture<FloatPriorityQueue<T>> identityAggregatedResult = CompletableFuture.completedFuture(new FloatPriorityQueue<>());
 
-		return futureFloatPriorityQueues.parallelStream().reduce(identityAggregatedResult, (currentAggregatedResult, futureFloatPriorityQueue) -> {
-			return currentAggregatedResult.thenApplyAsync((aggregatedFloatPriorityQueue) -> {
+		return futureFloatPriorityQueues.stream().reduce(identityAggregatedResult, (currentAggregatedResult, futureFloatPriorityQueue) -> {
+			return currentAggregatedResult.thenApply((aggregatedFloatPriorityQueue) -> {
 				var futureFloatPriorityQueueValues = futureFloatPriorityQueue.join();
 				if (futureFloatPriorityQueueValues == aggregatedFloatPriorityQueue) {
 					return aggregatedFloatPriorityQueue;
diff --git a/src/main/java/org/warp/commonutils/type/FloatPriorityQueue.java b/src/main/java/org/warp/commonutils/type/FloatPriorityQueue.java
index 8fcdd38..fa8fab0 100644
--- a/src/main/java/org/warp/commonutils/type/FloatPriorityQueue.java
+++ b/src/main/java/org/warp/commonutils/type/FloatPriorityQueue.java
@@ -224,7 +224,9 @@ public class FloatPriorityQueue<T> implements Queue<T> {
 	}
 
 	public boolean offer(ScoredValue<T> value) {
-		assert contentValues.size() == internalQueue.size();
+		int contentValuesSize = contentValues.size();
+		int internalQueueSize = internalQueue.size();
+		assert contentValuesSize == internalQueueSize;
 
 		boolean added = true;
 		float oldValue;