From 6572365811f11bb39184221a9c710dbf5523ea66 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 7 Sep 2010 12:48:41 +0000
Subject: [PATCH] LMS-1726 tiny improvements
SVN: 17747
---
.../ch/systemsx/cisd/etlserver/api/v1/PutDataSetService.java | 2 +-
.../openbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java | 1 -
.../cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java | 2 ++
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetService.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetService.java
index 880dd284983..d397ece0ef0 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetService.java
@@ -162,7 +162,7 @@ public class PutDataSetService
{
PutDataSetServiceInitializer initializer = new PutDataSetServiceInitializer();
- incomingDir.mkdir();
+ incomingDir.mkdirs();
pluginMap = initializer.getPluginMap();
pluginMap.initializeStoreRootDirectory(storeDirectory);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java
index 38e3ccdd4f4..ada1e72e7e2 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java
@@ -169,7 +169,6 @@ public class DssServiceRpcGeneric extends AbstractDssServiceRpc implements IDssS
@Override
public void setIncomingDirectory(File aFile)
{
- super.setIncomingDirectory(aFile);
putService.setIncomingDir(aFile);
}
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
index a2a338bf0cb..b6770465b6c 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
@@ -485,6 +485,8 @@ public class DssServiceRpcV1Test extends AbstractFileSystemTestCase
.getPath(), fileInfos));
rpcService.putDataSet(SESSION_TOKEN, newDataSet, fileInputStream);
+
+ context.assertIsSatisfied();
}
private List<IContent> getContentForFileInfos(String filePath, List<FileInfoDssDTO> fileInfos)
--
GitLab