From 1bed3742dc0aac6d257fc4b9ed8fe97c50afca5f Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Tue, 8 Mar 2011 08:54:15 +0000
Subject: [PATCH] [LMS-2112] bugfix BDSStorageProcessor (3rd and hopefully
final commit for LMS-2112)
SVN: 20237
---
.../ch/systemsx/cisd/etlserver/BDSStorageProcessor.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/BDSStorageProcessor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/BDSStorageProcessor.java
index 13eeea08eda..01a9bcd6426 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/BDSStorageProcessor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/BDSStorageProcessor.java
@@ -514,7 +514,7 @@ public final class BDSStorageProcessor extends AbstractStorageProcessor
private final void unstoreData()
{
- checkParameters(incomingDataSetDirectory, storedDataDirectory);
+ checkParameters(incomingDataSetDirectory, dataStructureDir);
if (dataStructure == null)
{
@@ -549,9 +549,10 @@ public final class BDSStorageProcessor extends AbstractStorageProcessor
final IFileOperations fileOps = FileOperations.getMonitoredInstanceForCurrentThread();
if (fileOps.exists(incomingDataSetDirectory))
{
- if (fileOps.removeRecursivelyQueueing(storedDataDirectory) == false)
+ if (dataStructureDir != null
+ && fileOps.removeRecursivelyQueueing(dataStructureDir) == false)
{
- operationLog.error("Cannot delete '" + storedDataDirectory.getAbsolutePath()
+ operationLog.error("Cannot delete '" + dataStructureDir.getAbsolutePath()
+ "'.");
}
} else
--
GitLab