From bc72c74d4fc250b6bc068eeb0e23617b32859535 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Thu, 5 Jan 2012 18:21:13 +0000
Subject: [PATCH] Replace Status.tryGetErrorMessage() with Status.toString()
where appropriate.
SVN: 24109
---
.../systemsx/cisd/common/compression/tiff/TiffCompressor.java | 2 +-
.../systemsx/cisd/common/concurrent/ParallelizedExecutor.java | 2 +-
.../systemsx/cisd/common/concurrent/ParallelizedWorker.java | 2 +-
.../cisd/common/filesystem/AbstractCopyActivitySensor.java | 2 +-
.../cisd/common/filesystem/QuietPeriodFileFilter.java | 4 ++--
.../source/java/ch/systemsx/cisd/etlserver/FileBasedFile.java | 4 ++--
.../openbis/dss/generic/server/ProcessDatasetsCommand.java | 2 +-
.../openbis/dss/generic/server/plugins/standard/Copier.java | 2 +-
.../server/plugins/standard/DataSetFileOperationsManager.java | 4 ++--
.../source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java | 2 +-
.../generic/server/authorization/AuthorizationAdvisor.java | 2 +-
.../cisd/openbis/dss/etl/AbstractImageStorageProcessor.java | 2 +-
12 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/compression/tiff/TiffCompressor.java b/common/source/java/ch/systemsx/cisd/common/compression/tiff/TiffCompressor.java
index 7594f98f760..20bb4420edf 100644
--- a/common/source/java/ch/systemsx/cisd/common/compression/tiff/TiffCompressor.java
+++ b/common/source/java/ch/systemsx/cisd/common/compression/tiff/TiffCompressor.java
@@ -88,7 +88,7 @@ public class TiffCompressor extends Compressor
for (FailureRecord r : failed)
{
errorMsgBuilder.append(String.format("%s (%s)\n", r.getFailedFile().getName(), r
- .getFailureStatus().tryGetErrorMessage()));
+ .getFailureStatus()));
}
return errorMsgBuilder.toString();
}
diff --git a/common/source/java/ch/systemsx/cisd/common/concurrent/ParallelizedExecutor.java b/common/source/java/ch/systemsx/cisd/common/concurrent/ParallelizedExecutor.java
index 6c113c5c867..fc51ffd0f85 100644
--- a/common/source/java/ch/systemsx/cisd/common/concurrent/ParallelizedExecutor.java
+++ b/common/source/java/ch/systemsx/cisd/common/concurrent/ParallelizedExecutor.java
@@ -191,7 +191,7 @@ public class ParallelizedExecutor
for (FailureRecord<T> r : failureRecords)
{
errorMsgBuilder.append(String.format("%s (%s)\n", r.getFailedItem().toString(), r
- .getFailureStatus().tryGetErrorMessage()));
+ .getFailureStatus()));
}
return errorMsgBuilder.toString();
}
diff --git a/common/source/java/ch/systemsx/cisd/common/concurrent/ParallelizedWorker.java b/common/source/java/ch/systemsx/cisd/common/concurrent/ParallelizedWorker.java
index 8da01fc9317..c7168864acb 100644
--- a/common/source/java/ch/systemsx/cisd/common/concurrent/ParallelizedWorker.java
+++ b/common/source/java/ch/systemsx/cisd/common/concurrent/ParallelizedWorker.java
@@ -160,7 +160,7 @@ class ParallelizedWorker<T> implements Runnable
{
if (status.isError())
{
- operationLog.error(status.tryGetErrorMessage());
+ operationLog.error(status);
}
}
diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/AbstractCopyActivitySensor.java b/common/source/java/ch/systemsx/cisd/common/filesystem/AbstractCopyActivitySensor.java
index 2c71022e49a..f0c4c21b252 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/AbstractCopyActivitySensor.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/AbstractCopyActivitySensor.java
@@ -140,7 +140,7 @@ public abstract class AbstractCopyActivitySensor implements IDescribingActivityS
if (currentResult.isError())
{
return "Error: Unable to determine the time of write activity on "
- + getTargetDescription() + "\n" + currentResult.tryGetErrorMessage();
+ + getTargetDescription() + "\n" + currentResult;
} else
{
final String inactivityPeriod =
diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/QuietPeriodFileFilter.java b/common/source/java/ch/systemsx/cisd/common/filesystem/QuietPeriodFileFilter.java
index 6e517acbc58..f3914d8acb2 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/QuietPeriodFileFilter.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/QuietPeriodFileFilter.java
@@ -176,7 +176,7 @@ public class QuietPeriodFileFilter implements IStoreItemFilter
{
conditionalNotificationLog.log(LogLevel.ERROR, String.format(
"Cannot obtain \"last changed\" status of item '%s' in store '%s': %s",
- item, fileStore, status.tryGetErrorMessage()));
+ item, fileStore, status));
return false;
} else
{
@@ -225,7 +225,7 @@ public class QuietPeriodFileFilter implements IStoreItemFilter
{
conditionalNotificationLog.log(LogLevel.ERROR, String.format(
"Cannot obtain \"last changed\" status of item '%s' in store '%s': %s", item,
- fileStore, status.tryGetErrorMessage()));
+ fileStore, status));
}
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/FileBasedFile.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/FileBasedFile.java
index 5a4ebb47a28..755d153e959 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/FileBasedFile.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/FileBasedFile.java
@@ -91,7 +91,7 @@ public class FileBasedFile implements IFile
throw new EnvironmentFailureException("Couldn't copy '"
+ sourceFile.getAbsolutePath() + "' using hard links to '"
+ destinationFile.getAbsolutePath()
- + "': " + status.tryGetErrorMessage());
+ + "': " + status);
}
} else
{
@@ -120,7 +120,7 @@ public class FileBasedFile implements IFile
throw new EnvironmentFailureException("Couldn't copy '"
+ sourceDirectory.getAbsolutePath() + "' using hard links to '"
+ destinationDirectory.getAbsolutePath()
- + "': " + status.tryGetErrorMessage());
+ + "': " + status);
}
} else
{
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ProcessDatasetsCommand.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ProcessDatasetsCommand.java
index 89c1fb83aa4..0ef4f6db4e0 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ProcessDatasetsCommand.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ProcessDatasetsCommand.java
@@ -276,7 +276,7 @@ public class ProcessDatasetsCommand extends AbstractDataSetDescriptionBasedComma
sb.append("- processing of ");
sb.append(unsuccessfullyProcessed.size());
sb.append(" data set(s) failed because: ");
- sb.append(" " + errorStatus.tryGetErrorMessage() + ". Datasets: ");
+ sb.append(" " + errorStatus + ". Datasets: ");
sb.append(getDataSetCodes(unsuccessfullyProcessed));
sb.append("\n");
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/Copier.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/Copier.java
index a5e671f34c7..dca6c8f3c81 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/Copier.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/Copier.java
@@ -123,7 +123,7 @@ public class Copier implements Serializable, IPostRegistrationDatasetHandler
+ " to destination folder '" + destination + "'"
+ (host != null ? " on host '" + host + "'" : "")
+ (rsyncModule != null ? " for rsync module '" + rsyncModule + "'" : "") + ": "
- + status.tryGetErrorMessage());
+ + status);
return Status.createError(DataSetCopier.COPYING_FAILED_MSG);
}
if (renameToDataSetCode)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManager.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManager.java
index 99c6b9c2273..e7e1af50b51 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManager.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManager.java
@@ -229,7 +229,7 @@ public class DataSetFileOperationsManager implements IDataSetFileOperationsManag
return resultStatus;
} catch (ExceptionWithStatus ex)
{
- return BooleanStatus.createError(ex.getStatus().tryGetErrorMessage());
+ return BooleanStatus.createError(ex.getStatus().toString());
}
}
@@ -251,7 +251,7 @@ public class DataSetFileOperationsManager implements IDataSetFileOperationsManag
return resultStatus;
} catch (ExceptionWithStatus ex)
{
- return BooleanStatus.createError(ex.getStatus().tryGetErrorMessage());
+ return BooleanStatus.createError(ex.getStatus().toString());
}
}
diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java
index d407372250f..52d2c58408f 100644
--- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java
+++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java
@@ -425,7 +425,7 @@ class FlowLaneFeeder extends AbstractPostRegistrationDataSetHandlerForFileBasedU
{
throw new EnvironmentFailureException("Couldn't create a hard-link copy of '"
+ file.getAbsolutePath() + "' in folder '" + folder.getAbsolutePath() + "'. ["
- + status.tryGetErrorMessage() + "]");
+ + status + "]");
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java
index 56a54491163..eb66eb30f0d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java
@@ -155,7 +155,7 @@ public final class AuthorizationAdvisor extends DefaultPointcutAdvisor
if (StatusFlag.OK.equals(status.getFlag()) == false)
{
final String groupCode = session.tryGetHomeGroupCode();
- final String errorMessage = status.tryGetErrorMessage();
+ final String errorMessage = status.toString();
authorizationLog.info(String.format(
"[USER:'%s' SPACE:%s]: Authorization failure while "
+ "invoking method '%s': %s", session.getUserName(),
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbstractImageStorageProcessor.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbstractImageStorageProcessor.java
index b829a8713af..c639f8cbf66 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbstractImageStorageProcessor.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbstractImageStorageProcessor.java
@@ -546,7 +546,7 @@ abstract class AbstractImageStorageProcessor extends AbstractStorageProcessor im
if (status.isError())
{
throw EnvironmentFailureException.fromTemplate("Cannot unzip '%s': %s",
- incomingDataSetDirectory.getName(), status.tryGetErrorMessage());
+ incomingDataSetDirectory.getName(), status);
}
return output;
}
--
GitLab