From b4821d21d16fb65a0fd6ee49f97988488134e183 Mon Sep 17 00:00:00 2001
From: felmer <franz-josef.elmer@id.ethz.ch>
Date: Tue, 8 Jan 2019 14:28:49 +0100
Subject: [PATCH] SSDM-7430: Bug in MasterDataParser and ResourceListParser
fix: Do not trim
---
.../sync/harvester/synchronizer/MasterDataParser.java | 6 +-----
.../sync/harvester/synchronizer/ResourceListParser.java | 6 ++----
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataParser.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataParser.java
index 1d0d2bc4990..58dd1b31517 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataParser.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataParser.java
@@ -274,11 +274,7 @@ public class MasterDataParser
private String getAttribute(Element termElement, String attr)
{
Node node = termElement.getAttributes().getNamedItem(attr);
- if (node != null)
- {
- return node.getTextContent().trim();
- }
- return null;
+ return node != null ? node.getTextContent() : null;
}
private void parseMaterialTypes(NodeList matTypesNode) throws XPathExpressionException
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ResourceListParser.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ResourceListParser.java
index 813b26fed37..e07a2fa9586 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ResourceListParser.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ResourceListParser.java
@@ -333,10 +333,8 @@ public class ResourceListParser
{
return null;
}
- } else
- {
- return val.trim();
- }
+ }
+ return val;
}
private String extractAttribute(Node xdNode, String attrName) throws IllegalArgumentException
--
GitLab