From 867169c711e84f360d5901ab0da831deb9ff8b83 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Fri, 14 Dec 2012 12:37:44 +0000
Subject: [PATCH] SP-435 / BIS-219: Make entity retrieval API for validation
complete - parents and children part - bugfix
SVN: 27931
---
.../EntityAdaptorRelationsLoader.java | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorRelationsLoader.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorRelationsLoader.java
index c1d893f0c0e..5a8353eb409 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorRelationsLoader.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorRelationsLoader.java
@@ -74,11 +74,18 @@ public class EntityAdaptorRelationsLoader
{
List<Long> parentIds =
entityIdsOfTypesLoader.loadEntityIdsOfTypes(entityId, matchingTypeIds);
- Criteria criteria = session.createCriteria(entityClass);
- criteria.setFetchSize(10);
- criteria.add(Restrictions.in("id", parentIds));
- ScrollableResults results = criteria.scroll(ScrollMode.FORWARD_ONLY);
- return new EntityAdaptorIterator<T>(results, evaluator, session);
+
+ if (parentIds != null && parentIds.size() > 0)
+ {
+ Criteria criteria = session.createCriteria(entityClass);
+ criteria.setFetchSize(10);
+ criteria.add(Restrictions.in("id", parentIds));
+ ScrollableResults results = criteria.scroll(ScrollMode.FORWARD_ONLY);
+ return new EntityAdaptorIterator<T>(results, evaluator, session);
+ } else
+ {
+ return Collections.emptyList();
+ }
}
}
--
GitLab