From e6a1ea72d84f022e02cd9fa4bee7eb84ac67ef28 Mon Sep 17 00:00:00 2001
From: gakin <gakin>
Date: Mon, 16 Jan 2017 13:41:19 +0000
Subject: [PATCH] SSDM-4593 OpenbisSync: Handle property types of type Material
of Any type
SVN: 37589
---
.../plugins/sync/common/MasterDataExtractor.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/MasterDataExtractor.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/MasterDataExtractor.java
index beec6768ad6..7dc1723bf43 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/MasterDataExtractor.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/MasterDataExtractor.java
@@ -142,10 +142,16 @@ public class MasterDataExtractor
{
propertyTypeElement.setAttribute("vocabulary", propertyTypeImmutable.getVocabulary().getCode());
}
- else if (propertyTypeImmutable.getDataType().name().equals(DataType.MATERIAL.name())
- && propertyTypeImmutable.getMaterialType() != null)
- {
- propertyTypeElement.setAttribute("material", propertyTypeImmutable.getMaterialType().getCode());
+ else if (propertyTypeImmutable.getDataType().name().equals(DataType.MATERIAL.name())) {
+ if (propertyTypeImmutable.getMaterialType() != null)
+ {
+ propertyTypeElement.setAttribute("material", propertyTypeImmutable.getMaterialType().getCode());
+ }
+ else
+ {
+ // for properties like "inhibitor_of" where it is of Material of Any Type
+ propertyTypeElement.setAttribute("material", "");
+ }
}
propertyTypesElement.appendChild(propertyTypeElement);
}
--
GitLab