Merge branch 'hotfix-1.10.x' into hotfix-2.1.x

gentics · Oct 1, 2024 · e5cc5ef · e5cc5ef
2 parents 37c0551 + d97f0ef
commit e5cc5ef
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/LTS-CHANGELOG.adoc b/LTS-CHANGELOG.adoc
@@ -17,6 +17,11 @@ include::content/docs/variables.adoc-include[]
 The LTS changelog lists releases which are only accessible via a commercial subscription.
 All fixes and changes in LTS releases will be released the next minor release. Changes from LTS 1.4.x will be included in release 1.5.0.
 
+[[v1.10.35]]
+== 1.10.35 (27.09.2024)
+
+icon:check[] Core: A crash, caused by duplicated nodes in a GraphQL resulting set, has been fixed.
+
 [[v1.10.34]]
 == 1.10.34 (11.09.2024)
 

diff --git a/changelog/src/changelog/entries/2024/09/7984.SUP-17450.bugfix b/changelog/src/changelog/entries/2024/09/7984.SUP-17450.bugfix
@@ -0,0 +1 @@
+Core: A crash, caused by duplicated nodes in a GraphQL resulting set, has been fixed.
diff --git a/...rientdb-wrapper/src/main/java/com/gentics/mesh/core/data/dao/impl/NodeDaoWrapperImpl.java b/...rientdb-wrapper/src/main/java/com/gentics/mesh/core/data/dao/impl/NodeDaoWrapperImpl.java
@@ -8,6 +8,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -114,7 +115,7 @@ public Stream<? extends HibNode> getChildrenStream(HibNode node, InternalActionC
 	@SuppressWarnings("unchecked")
 	@Override
 	public Map<HibNode, List<HibNode>> getChildren(Collection<HibNode> nodes, String branchUuid) {
-		return nodes.stream()
+		return new HashSet<>(nodes).stream()
 				.map(node -> Pair.of(node, (List<HibNode>) getChildren(node, branchUuid).list()))
 				.collect(Collectors.toMap(Pair::getKey, Pair::getValue));
 	}
@@ -231,7 +232,7 @@ public long globalCount() {
 
 	@Override
 	public Map<HibNode, List<HibNode>> getBreadcrumbNodesMap(Collection<HibNode> nodes, InternalActionContext ac) {
-		return nodes.stream().map(node -> Pair.of(node,
+		return new HashSet<>(nodes).stream().map(node -> Pair.of(node,
 				getBreadcrumbNodes(node, ac)
 						.stream()
 						.map(HibNode.class::cast)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Core: A crash, caused by duplicated nodes in a GraphQL resulting set, has been fixed.