From ac15f08d045a29a62e67efe447b8aa4240b2a0cd Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Wed, 12 Aug 2015 08:47:55 +0000
Subject: [PATCH] SSDM-2091 : Do not shuffle recently deleted data sets,
polished implementation
SVN: 34439
---
.../openbis/generic/server/ServiceForDataStoreServer.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServer.java
index a02d54d59ce..a59e79e8e5e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServer.java
@@ -1050,12 +1050,7 @@ public class ServiceForDataStoreServer extends AbstractCommonServer<IServiceForD
if (dataSet == null)
{
//Check if the dataset is on the trashcan
- TechId dataSetTechId = getDAOFactory().getDataDAO().tryToFindDataSetIdByCode(dataSetCode);
- List<String> queryDatasetOnTrashCan = null;
- if(dataSetTechId != null) {
- queryDatasetOnTrashCan = getDAOFactory().getDeletionDAO().findTrashedDataSetCodes(Arrays.asList(dataSetTechId));
- }
- boolean isDataSetOnTrashCan = queryDatasetOnTrashCan != null && queryDatasetOnTrashCan.size() == 1;
+ boolean isDataSetOnTrashCan = getDAOFactory().getDataDAO().exists(dataSetCode);
//Check if the dataset is finally deleted
boolean isDataSetDeleted = getDAOFactory().getEventDAO().tryFind(
dataSetCode,
--
GitLab