From acd545d61d3292b0214ba896ddba2fe2e31ac001 Mon Sep 17 00:00:00 2001
From: felmer <franz-josef.elmer@id.ethz.ch>
Date: Mon, 6 Jan 2020 08:41:56 +0100
Subject: [PATCH] SSDM-9121: Bug fixed: Spurious error message in Unarchiving
Helper in case of empty search result sets
---
.../plugins/standard/ArchivingAggregationService.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ArchivingAggregationService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ArchivingAggregationService.java
index 8817c392777..9582b918ef4 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ArchivingAggregationService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ArchivingAggregationService.java
@@ -30,6 +30,8 @@ import java.util.TreeMap;
import java.util.TreeSet;
import java.util.stream.Collectors;
+import org.apache.commons.lang3.StringUtils;
+
import com.fasterxml.jackson.core.JsonProcessingException;
import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
@@ -201,7 +203,11 @@ public class ArchivingAggregationService extends AggregationService
String[] splitted = ((String) args).split(",");
for (String string : splitted)
{
- result.add(string.trim());
+ String arg = string.trim();
+ if (StringUtils.isNotBlank(arg))
+ {
+ result.add(arg);
+ }
}
}
return result;
--
GitLab