Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
b670ea71
Commit
b670ea71
authored
12 years ago
by
brinn
Browse files
Options
Downloads
Patches
Plain Diff
Allow the client to write anywhere into session workspace, not just a sub-directory.
SVN: 26271
parent
b20206f6
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java
+2
-7
2 additions, 7 deletions
...enbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java
with
2 additions
and
7 deletions
datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java
+
2
−
7
View file @
b670ea71
...
...
@@ -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
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment