From 6e637e98b71ca5b64c033112ae2c6264f96b8b4c Mon Sep 17 00:00:00 2001
From: gakin <gakin>
Date: Tue, 8 Nov 2016 09:28:39 +0000
Subject: [PATCH] SSDM-4318: OpenbisSync pass in do-not-create-original-dir"
flag as true while running the aggregation service to register data sets.
SVN: 37284
---
.../dss/plugins/harvester/synchronizer/EntitySynchronizer.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/harvester/synchronizer/EntitySynchronizer.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/harvester/synchronizer/EntitySynchronizer.java
index ccfa05bcbe3..330c45d307a 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/harvester/synchronizer/EntitySynchronizer.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/harvester/synchronizer/EntitySynchronizer.java
@@ -498,7 +498,7 @@ public class EntitySynchronizer
v3Api.deleteMaterials(sessionToken, matPermIds, matDeletionOptions);
// confirm deletions
- ArrayList deletionIds = new ArrayList();
+ ArrayList<IDeletionId> deletionIds = new ArrayList<IDeletionId>();
if (expDeletionId != null)
{
deletionIds.add(expDeletionId);
@@ -854,6 +854,7 @@ public class EntitySynchronizer
props.setProperty("as-url", EntitySynchronizer.this.config.getDataSourceOpenbisURL());
props.setProperty("dss-url", EntitySynchronizer.this.config.getDataSourceDSSURL());
props.setProperty("harvester-temp-dir", EntitySynchronizer.this.config.getHarvesterTempDir());
+ props.setProperty("do-not-create-original-dir", "true");
return props;
}
}
--
GitLab