From b670ea71523e116561d0545ca8adc1a971b0c0d5 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Mon, 30 Jul 2012 08:03:48 +0000
Subject: [PATCH] Allow the client to write anywhere into session workspace,
not just a sub-directory.
SVN: 26271
---
.../dss/generic/server/api/v1/DssServiceRpcGeneric.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
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 1a41cf1ab1d..0f67590039e 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
@@ -60,11 +60,6 @@ import de.schlichtherle.io.FileOutputStream;
public class DssServiceRpcGeneric extends AbstractDssServiceRpc<IDssServiceRpcGenericInternal>
implements IDssServiceRpcGenericInternal
{
- /**
- * The sub-directory in the session workspace reserved for clients to drop files.
- */
- private static final String CLIENT_DROP_SUB_DIR = "clientDrop";
-
/**
* Logger with {@link LogCategory#OPERATION} with name of the concrete class, needs to be static
* for our purpose.
@@ -212,7 +207,7 @@ public class DssServiceRpcGeneric extends AbstractDssServiceRpc<IDssServiceRpcGe
final File workspaceDir =
new SessionWorkspaceProvider(sessionWorkspaceRootDirectory, sessionToken)
.getSessionWorkspace();
- final File dir = new File(workspaceDir, FilenameUtils.concat(CLIENT_DROP_SUB_DIR, subDir));
+ final File dir = new File(workspaceDir, subDir);
dir.mkdirs();
final File file = new File(dir, filename);
OutputStream ostream = null;
@@ -242,7 +237,7 @@ public class DssServiceRpcGeneric extends AbstractDssServiceRpc<IDssServiceRpcGe
final File workspaceDir =
new SessionWorkspaceProvider(sessionWorkspaceRootDirectory, sessionToken)
.getSessionWorkspace();
- final File file = new File(workspaceDir, FilenameUtils.concat(CLIENT_DROP_SUB_DIR, path));
+ final File file = new File(workspaceDir, path);
FileUtilities.deleteRecursively(file);
return file.exists() == false;
}
--
GitLab