From 9be61f6b8f4cd78a8648dab6b366ea0c691a34d5 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 7 Apr 2011 14:49:42 +0000
Subject: [PATCH] LMS-2068 compilation error fixed by a quick hack because
somebody changed this interface method in the same time
SVN: 20711
---
.../AbstractArchiverProcessingPlugin.java | 34 +++++++++++--------
1 file changed, 20 insertions(+), 14 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPlugin.java
index 362601a0b8e..63307849c05 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPlugin.java
@@ -56,6 +56,7 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.utils.Share;
import ch.systemsx.cisd.openbis.generic.server.business.bo.SimpleDataSetHelper;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetArchivingStatus;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DeletedDataSet;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IDatasetLocation;
import ch.systemsx.cisd.openbis.generic.shared.dto.DatasetDescription;
import ch.systemsx.cisd.openbis.generic.shared.dto.SimpleDataSetInformationDTO;
@@ -560,24 +561,29 @@ public abstract class AbstractArchiverProcessingPlugin extends AbstractDatastore
return provider.getShareIdManager();
}
- public File getDataSetDirectory(DatasetDescription dataSet)
- {
- SimpleDataSetInformationDTO translatedDataSet = SimpleDataSetHelper.translate(dataSet);
- String dataSetCode = dataSet.getDatasetCode();
- IShareIdManager shareIdManager = getShareIdManager();
- String shareId = shareIdManager.getShareId(dataSetCode);
- translatedDataSet.setDataSetShareId(shareId);
- Share share = shareFinder.tryToFindShare(translatedDataSet, shares);
- if (share != null)
+ public File getDataSetDirectory(IDatasetLocation dataSetLocation)
+ {
+ if (dataSetLocation instanceof DatasetDescription)
{
- String newShareId = share.getShareId();
- if (newShareId.equals(shareId) == false)
+ // TODO 2011-04-07, FJE: A quick hack because somebody changed this interface method in the same time
+ DatasetDescription dataSet = (DatasetDescription) dataSetLocation;
+ SimpleDataSetInformationDTO translatedDataSet = SimpleDataSetHelper.translate(dataSet);
+ String dataSetCode = dataSet.getDatasetCode();
+ IShareIdManager shareIdManager = getShareIdManager();
+ String shareId = shareIdManager.getShareId(dataSetCode);
+ translatedDataSet.setDataSetShareId(shareId);
+ Share share = shareFinder.tryToFindShare(translatedDataSet, shares);
+ if (share != null)
{
- service.updateShareIdAndSize(dataSetCode, newShareId, dataSet.getDataSetSize());
- shareIdManager.setShareId(dataSetCode, newShareId);
+ String newShareId = share.getShareId();
+ if (newShareId.equals(shareId) == false)
+ {
+ service.updateShareIdAndSize(dataSetCode, newShareId, dataSet.getDataSetSize());
+ shareIdManager.setShareId(dataSetCode, newShareId);
+ }
}
}
- return provider.getDataSetDirectory(dataSet);
+ return provider.getDataSetDirectory(dataSetLocation);
}
}
--
GitLab