From cda3b26f56155660122c9afdcefeee6602777fbf Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Tue, 10 May 2011 20:26:17 +0000
Subject: [PATCH] adapt hcs storage processor
SVN: 21216
---
.../etl/AbstractImageStorageProcessor.java | 26 +++++++++----------
1 file changed, 12 insertions(+), 14 deletions(-)
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 5178f75960b..d3bfa4e9646 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
@@ -290,22 +290,15 @@ abstract class AbstractImageStorageProcessor extends AbstractStorageProcessor im
File imagesInStoreFolder = moveToStore(incomingDataSetDirectory, rootDirectory);
this.storedDataDirectory = rootDirectory;
- try
- {
- // NOTE: plateImages will be changed by reference
- processImages(rootDirectory, plateImages, imagesInStoreFolder,
- imageStorageConfiguraton);
+ // NOTE: plateImages will be changed by reference
+ processImages(rootDirectory, plateImages, imagesInStoreFolder, imageStorageConfiguraton);
- shouldDeleteOriginalDataOnCommit =
- imageStorageConfiguraton.getOriginalDataStorageFormat().isHdf5();
+ shouldDeleteOriginalDataOnCommit =
+ imageStorageConfiguraton.getOriginalDataStorageFormat().isHdf5();
+
+ dbTransaction = createQuery();
+ storeInDatabase(dbTransaction, dataSetInformation, extractionResult);
- dbTransaction = createQuery();
- storeInDatabase(dbTransaction, dataSetInformation, extractionResult);
- } catch (RuntimeException ex)
- {
- moveFilesBackFromStore();
- throw ex;
- }
return rootDirectory;
}
@@ -373,6 +366,11 @@ abstract class AbstractImageStorageProcessor extends AbstractStorageProcessor im
private final void moveFilesBackFromStore()
{
+ if (storedDataDirectory == null)
+ {
+ // nothing has been stored yet
+ return;
+ }
checkParameters(incomingDataSetDirectory, storedDataDirectory);
final File originalDataFile = tryGetProprietaryData();
--
GitLab