From 62f1d8833b6ecfb5eb9213a32ffa56542a1b5f71 Mon Sep 17 00:00:00 2001
From: Alex Bogdanovski <alex@erudika.com>
Date: Sun, 27 Dec 2020 21:29:44 +0200
Subject: [PATCH] fixed ConcurrentModificationException in River class

---
 para-server/src/main/java/com/erudika/para/queue/River.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/para-server/src/main/java/com/erudika/para/queue/River.java b/para-server/src/main/java/com/erudika/para/queue/River.java
index 20a4f353..630ec7ba 100644
--- a/para-server/src/main/java/com/erudika/para/queue/River.java
+++ b/para-server/src/main/java/com/erudika/para/queue/River.java
@@ -279,7 +279,7 @@ protected int processIndexPayload(String appid, String opId, Map<String, Object>
 			}
 			return 1;
 		} catch (Exception e) {
-			logger.error("Indexing operation " + opId + " failed!", e);
+			logger.error("Indexing operation " + opId + " failed for app '" + appid + "'!", e);
 		}
 		return 0;
 	}
@@ -306,7 +306,7 @@ private void indexAllWithRetry(String appid, Object payload) {
 		Map<String, ParaObject> objs = Para.getDAO().readAll(appid, ids, true);
 		Para.getSearch().indexAll(appid, objs.values().stream().filter(v -> v != null).collect(Collectors.toList()));
 
-		if (objs.keySet().stream().anyMatch(k -> objs.get(k) == null)) {
+		if (objs.containsValue(null)) {
 			if (pendingIds == null) {
 				pendingIds = new ConcurrentHashMap<>();
 			}