From 95a3f91166c3901979c0807184e9754e388a87af Mon Sep 17 00:00:00 2001
From: gakin <gakin>
Date: Tue, 17 Jan 2017 18:24:38 +0000
Subject: [PATCH] SSDM-4334 : OpenbisSync handle properties that are in the
"internalNamespace" in resource list.
SVN: 37602
---
.../server/dss/plugins/sync/common/MasterDataExtractor.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 c0189424156..f2278d0f92e 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
@@ -55,6 +55,7 @@ import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IPropertyTypeImmuta
import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.ISampleTypeImmutable;
import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IVocabularyImmutable;
import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IVocabularyTermImmutable;
+import ch.systemsx.cisd.openbis.generic.shared.basic.CodeConverter;
/**
*
@@ -292,7 +293,8 @@ public class MasterDataExtractor
{
Element propertyAssignmentElement = doc.createElement("propertyAssignment");
propertyAssignmentsElement.appendChild(propertyAssignmentElement);
- propertyAssignmentElement.setAttribute("property_type_code", propAssignment.getPropertyType().getCode());
+ propertyAssignmentElement.setAttribute("property_type_code", CodeConverter.tryToBusinessLayer(propAssignment.getPropertyType().getCode(),
+ propAssignment.getPropertyType().isInternalNameSpace()));
// propertyAssigmentElement.setAttribute("data_type_code", propAssignment.getPropertyType().getDataType().toString());
propertyAssignmentElement.setAttribute("ordinal", String.valueOf(propAssignment.getOrdinal()));
propertyAssignmentElement.setAttribute("section", propAssignment.getSection());
--
GitLab