From aaf15d0ea00fd562aae17d5bb3e4918a1bfb4779 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 20 Apr 2016 06:35:49 +0000
Subject: [PATCH] SSDM-3412: PathInfoProviderBasedHierarchicalContent: Instead
of throwing an exception if children path infos are null an empty array is
returned.
SVN: 36233
---
.../PathInfoProviderBasedHierarchicalContent.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoProviderBasedHierarchicalContent.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoProviderBasedHierarchicalContent.java
index db35117fbe9..8c4d4a61b49 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoProviderBasedHierarchicalContent.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoProviderBasedHierarchicalContent.java
@@ -243,16 +243,15 @@ public class PathInfoProviderBasedHierarchicalContent implements IHierarchicalCo
@Override
protected List<IHierarchicalContentNode> doGetChildNodes()
{
+ List<IHierarchicalContentNode> result = new ArrayList<IHierarchicalContentNode>();
List<DataSetPathInfo> pathInfos =
dataSetPathInfoProvider.listChildrenPathInfos(pathInfo);
- if (pathInfos == null)
- {
- throw new IllegalArgumentException("No children path infos for " + pathInfo.getRelativePath());
- }
- List<IHierarchicalContentNode> result = new ArrayList<IHierarchicalContentNode>();
- for (DataSetPathInfo child : pathInfos)
+ if (pathInfos != null)
{
- result.add(asNode(child));
+ for (DataSetPathInfo child : pathInfos)
+ {
+ result.add(asNode(child));
+ }
}
return result;
}
--
GitLab