From a4d8bd060c35bdeb0b790c8b369abcf9443a7038 Mon Sep 17 00:00:00 2001
From: gakin <gakin>
Date: Mon, 10 Apr 2017 13:22:20 +0000
Subject: [PATCH] SSDM-4584 : OpenbisSync Master data sync - defer material
property assignments for new materials as well
SVN: 38033
---
.../harvester/synchronizer/MasterDataSynchronizer.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataSynchronizer.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataSynchronizer.java
index 3cae25520e4..0ec9c5e7a7f 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataSynchronizer.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataSynchronizer.java
@@ -273,18 +273,15 @@ public class MasterDataSynchronizer
if (existingEntityType != null)
{
updateEntityType(entityKind, incomingEntityType);
- if (entityKind != EntityKind.MATERIAL) // defer material property assignments until after property types are processed
+ if (list != null && entityKind != EntityKind.MATERIAL) // defer material property assignments until after property types are processed
{
- if (list != null)
- {
- processPropertyAssignments(existingEntityType, list);
- }
+ processPropertyAssignments(existingEntityType, list);
}
}
else
{
registerEntityType(entityKind, incomingEntityType);
- if (list != null)
+ if (list != null && entityKind != EntityKind.MATERIAL) // defer material property assignments until after property types are processed
{
assignProperties(list);
}
--
GitLab