From 0d4c88282e4c297ce457affb410e84e3e7b6e1a1 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Wed, 12 Aug 2015 07:49:13 +0000
Subject: [PATCH] SSDM-2091 : Do not shuffle recently deleted data sets,
polished implementation
SVN: 34438
---
.../openbis/generic/server/ServiceForDataStoreServer.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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 12e3912be8c..a02d54d59ce 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
@@ -1051,7 +1051,10 @@ public class ServiceForDataStoreServer extends AbstractCommonServer<IServiceForD
{
//Check if the dataset is on the trashcan
TechId dataSetTechId = getDAOFactory().getDataDAO().tryToFindDataSetIdByCode(dataSetCode);
- List<String> queryDatasetOnTrashCan = getDAOFactory().getDeletionDAO().findTrashedDataSetCodes(Arrays.asList(dataSetTechId));
+ List<String> queryDatasetOnTrashCan = null;
+ if(dataSetTechId != null) {
+ queryDatasetOnTrashCan = getDAOFactory().getDeletionDAO().findTrashedDataSetCodes(Arrays.asList(dataSetTechId));
+ }
boolean isDataSetOnTrashCan = queryDatasetOnTrashCan != null && queryDatasetOnTrashCan.size() == 1;
//Check if the dataset is finally deleted
boolean isDataSetDeleted = getDAOFactory().getEventDAO().tryFind(
--
GitLab