From c17ca9dfb06b4c32247946d3a804afb6614f33ca Mon Sep 17 00:00:00 2001
From: vkovtun <viktor.kovtun@id.ethz.ch>
Date: Thu, 30 Mar 2023 15:57:21 +0200
Subject: [PATCH] SSDM-13126: Fixed the incorrect behavior of
DataSetSearchCriteria.withContainer().
---
.../v3/search/planner/AbstractCompositeEntitySearchManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractCompositeEntitySearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractCompositeEntitySearchManager.java
index 4be32773093..91e87474e77 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractCompositeEntitySearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractCompositeEntitySearchManager.java
@@ -175,7 +175,7 @@ public abstract class AbstractCompositeEntitySearchManager<CRITERIA extends Abst
? Collections.singleton(containerCriteriaIntermediateResults) : Collections.emptySet(),
nestedCriteriaIntermediateResults);
} else if (mainCriteria.isEmpty() && parentRelationshipsCriteria.isEmpty()
- && childRelationshipsCriteria.isEmpty() && nestedCriteria.isEmpty())
+ && childRelationshipsCriteria.isEmpty() && nestedCriteria.isEmpty() && containerCriteria.isEmpty())
{
// If we don't have results and criteria are empty, return all.
results = getAllIds(userId, authorisationInformation, idsColumnName, tableMapper, null);
--
GitLab