SSDM-4584 : OpenbisSync Master data sync - defer material property assignments...

SSDM-4584 : OpenbisSync Master data sync - defer material property assignments for new materials as well

SVN: 38033

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);
                 }