From db4bf7b9c595f3fca751c387be787d0590c306dd Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Mon, 10 May 2010 08:54:49 +0000
Subject: [PATCH] minor: better error message, remove unused code
SVN: 15856
---
.../plugins/standard/AbstractArchiverProcessingPlugin.java | 4 +++-
.../generic/shared/QueueingDataSetStatusUpdaterService.java | 4 ----
2 files changed, 3 insertions(+), 5 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 d9c456101dd..7b33fdcbc96 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
@@ -120,7 +120,9 @@ public abstract class AbstractArchiverProcessingPlugin extends AbstractDatastore
unarchive(dataset);
} catch (UserFailureException ex)
{
- return Status.createError(ex.getMessage());
+ return Status
+ .createError(ex.getMessage() == null ? "unknown reason"
+ : ex.getMessage());
}
return Status.OK;
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/QueueingDataSetStatusUpdaterService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/QueueingDataSetStatusUpdaterService.java
index 2fc9bbb9b1a..c77a305c2ad 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/QueueingDataSetStatusUpdaterService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/QueueingDataSetStatusUpdaterService.java
@@ -22,7 +22,6 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.springframework.remoting.RemoteAccessException;
-import ch.rinn.restrictions.Private;
import ch.systemsx.cisd.base.exceptions.InterruptedExceptionUnchecked;
import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.collections.CollectionUtils;
@@ -60,9 +59,6 @@ public class QueueingDataSetStatusUpdaterService
private static final int INITIAL_RECORD_SIZE = 128;
- @Private
- final static String UPDATER_PREFIX = ".UPDATER_";
-
private static IExtendedBlockingQueue<DataSetCodesWithStatus> queue = null;
private static ICloseable queueCloseableOrNull = null;
--
GitLab