From d4ce58d91def3372d1e4fd7a069fd5ee36ebbac5 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 12 Jul 2010 11:15:57 +0000
Subject: [PATCH] LMS-1612 deleteDataSet() added to IEncapsulatedOpenBISService

SVN: 16978
---
 .../generic/server/EncapsulatedOpenBISService.java | 14 ++++++++++++++
 .../shared/IEncapsulatedOpenBISService.java        |  7 +++++++
 2 files changed, 21 insertions(+)

diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
index 47830fa04aa..d5fe2d712bb 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
@@ -467,6 +467,20 @@ public final class EncapsulatedOpenBISService implements IEncapsulatedOpenBISSer
                     + ".");
         }
     }
+    
+    synchronized public void deleteDataSet(String dataSetCode, String reason)
+            throws UserFailureException
+    {
+        checkSessionToken();
+        try
+        {
+            service.deleteDataSet(sessionToken, dataSetCode, reason);
+        } catch (final InvalidSessionException ex)
+        {
+            authenticate();
+            service.deleteDataSet(sessionToken, dataSetCode, reason);
+        }
+    }
 
     synchronized public final void updateDataSet(String code, List<NewProperty> properties,
             SpaceIdentifier space) throws UserFailureException
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java
index 5d412002e5d..a37aea5cde2 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java
@@ -164,6 +164,13 @@ public interface IEncapsulatedOpenBISService
      */
     public void registerDataSet(final DataSetInformation dataSetInformation,
             final NewExternalData data) throws UserFailureException;
+    
+    /**
+     * Deletes specified data set if it exists.
+     * 
+     * @param reason for deletion.
+     */
+    public void deleteDataSet(String dataSetCode, String reason) throws UserFailureException;
 
     /**
      * Tries to return the properties of the top sample (e.g. master plate) registered for the
-- 
GitLab