From a54d2d2cb670be6320b0590477c80722091e6cbd Mon Sep 17 00:00:00 2001
From: juanf <juanf@ethz.ch>
Date: Fri, 12 Aug 2022 11:37:19 +0200
Subject: [PATCH] SSDM-12864 : Updated property delete behaviour
---
.../server/xls/importer/helper/ExperimentImportHelper.java | 4 ++--
.../server/xls/importer/helper/SampleImportHelper.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ExperimentImportHelper.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ExperimentImportHelper.java
index fadb1a59580..e8cf9605259 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ExperimentImportHelper.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ExperimentImportHelper.java
@@ -167,9 +167,9 @@ public class ExperimentImportHelper extends BasicImportHelper
if (!attributeValidator.isHeader(key))
{
String value = getValueByColumnName(header, values, key);
- if (value != null && value.isEmpty()) { // Skip empty values to avoid deleting by mistake
+ if (value == null || value.isEmpty()) { // Skip empty values to avoid deleting by mistake
continue;
- } else if (value != null && (value.equals("--DELETE--") || value.equals("__DELETE__"))) // Do explicit delete
+ } else if (value.equals("--DELETE--") || value.equals("__DELETE__")) // Do explicit delete
{
value = null;
} else { // Normal behaviour, set value
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SampleImportHelper.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SampleImportHelper.java
index cd4b8953517..79b7bfac070 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SampleImportHelper.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SampleImportHelper.java
@@ -330,9 +330,9 @@ public class SampleImportHelper extends BasicImportHelper
if (!attributeValidator.isHeader(key))
{
String value = getValueByColumnName(header, values, key);
- if (value != null && value.isEmpty()) { // Skip empty values to avoid deleting by mistake
+ if (value == null || value.isEmpty()) { // Skip empty values to avoid deleting by mistake
continue;
- } else if (value != null && (value.equals("--DELETE--") || value.equals("__DELETE__"))) // Do explicit delete
+ } else if (value.equals("--DELETE--") || value.equals("__DELETE__")) // Do explicit delete
{
value = null;
} else { // Normal behaviour, set value
--
GitLab