From 38412d07b532d6ac8ab7261e04c5aa8edb873f30 Mon Sep 17 00:00:00 2001
From: gpawel <gpawel>
Date: Wed, 15 Jun 2011 10:58:03 +0000
Subject: [PATCH] minor: improved error handling
SVN: 21694
---
.../cisd/plasmid/dss/PlasmidStorageProcessor.java | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/plasmid/source/java/ch/ethz/bsse/cisd/plasmid/dss/PlasmidStorageProcessor.java b/plasmid/source/java/ch/ethz/bsse/cisd/plasmid/dss/PlasmidStorageProcessor.java
index 9119e270d91..9046a3913a5 100644
--- a/plasmid/source/java/ch/ethz/bsse/cisd/plasmid/dss/PlasmidStorageProcessor.java
+++ b/plasmid/source/java/ch/ethz/bsse/cisd/plasmid/dss/PlasmidStorageProcessor.java
@@ -29,6 +29,7 @@ import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.mail.IMailClient;
+import ch.systemsx.cisd.common.shared.basic.utils.StringUtils;
import ch.systemsx.cisd.common.utilities.PropertyUtils;
import ch.systemsx.cisd.etlserver.AbstractDelegatingStorageProcessor;
import ch.systemsx.cisd.etlserver.AbstractDelegatingStorageProcessorTransaction;
@@ -50,8 +51,11 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
*/
public class PlasmidStorageProcessor extends AbstractDelegatingStorageProcessor
{
- private static final Logger operationLog =
- LogFactory.getLogger(LogCategory.OPERATION, PlasmidStorageProcessor.class);
+ private static final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION,
+ PlasmidStorageProcessor.class);
+
+ private static final Logger notifyLog = LogFactory.getLogger(LogCategory.NOTIFY,
+ PlasmidStorageProcessor.class);
private final static String PLASMAPPER_BASE_URL_KEY = "plasmapper-base-url";
@@ -155,6 +159,13 @@ public class PlasmidStorageProcessor extends AbstractDelegatingStorageProcessor
final File destinationFile)
{
String outputFilePath = uploader.upload(seqFile, service);
+ if (StringUtils.isBlank(outputFilePath))
+ {
+ notifyLog.error("Cannot upload file '" + seqFile.getName()
+ + "', see jetty.out for details.");
+ throw new IllegalStateException("Cannot upload file '" + seqFile.getName()
+ + "', see jetty.out for details.");
+ }
File outputFile = new File(serverRootDir + outputFilePath);
if (outputFile.isFile())
{
--
GitLab