From 7dea79c8a1d04693be2bc91f1db56b7790d98268 Mon Sep 17 00:00:00 2001
From: gakin <gakin>
Date: Wed, 14 Sep 2016 18:57:29 +0000
Subject: [PATCH] SSDM-4099: Minor clean-up.
SVN: 37081
---
.../generic/server/dss/plugins/DataSetRegistrationTask.java | 2 +-
.../sis/openbis/generic/shared/entitygraph/EntityGraph.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/DataSetRegistrationTask.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/DataSetRegistrationTask.java
index 9b15c41c6a3..32ef61643fe 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/DataSetRegistrationTask.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/DataSetRegistrationTask.java
@@ -895,7 +895,7 @@ public class DataSetRegistrationTask<T extends DataSetInformation> implements IM
// confirm deletions
// TODO confirm
- // v3Api.confirmDeletions(sessionToken, Arrays.asList(expDeletionId, dsDeletionId, smpDeletionId));
+ v3Api.confirmDeletions(sessionToken, Arrays.asList(expDeletionId, dsDeletionId, smpDeletionId));
}
private void saveSyncTimestamp()
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/shared/entitygraph/EntityGraph.java b/openbis/source/java/ch/ethz/sis/openbis/generic/shared/entitygraph/EntityGraph.java
index c305f743678..8531c191458 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/shared/entitygraph/EntityGraph.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/shared/entitygraph/EntityGraph.java
@@ -152,8 +152,7 @@ public class EntityGraph<N extends Node<?>>
String differentiatorStr = "";
if (node.getEntityKind().equals("EXPERIMENT")) // in order to differentiate between experiments in the same space but under different projects
{
- differentiatorStr = "-" +
- node.getPermId().substring(node.getPermId().indexOf('-') + 1);
+ differentiatorStr = node.getPermId().substring(node.getPermId().indexOf('-') + 1);
}
else {
differentiatorStr = "" + node.getEntityKind().charAt(0);
--
GitLab