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
facb4a7d
Commit
facb4a7d
authored
12 years ago
by
brinn
Browse files
Options
Downloads
Patches
Plain Diff
Fix copier not to call hostAwareFile.getLocalFile() if we work on a remote file.
SVN: 26519
parent
5f3a456d
Loading
Loading
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/plugins/standard/Copier.java
+6
-7
6 additions, 7 deletions
...d/openbis/dss/generic/server/plugins/standard/Copier.java
with
6 additions
and
7 deletions
datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/Copier.java
+
6
−
7
View file @
facb4a7d
...
...
@@ -119,10 +119,10 @@ public class Copier implements Serializable, IPostRegistrationDatasetHandler
FileUtilities
.
checkPathCopier
(
copier
,
host
,
null
,
rsyncModule
,
rsyncPasswordFile
,
DataSetCopier
.
SSH_TIMEOUT_MILLIS
);
}
File
destination
=
hostAwareFile
.
get
LocalFile
();
File
destinationFile
=
new
File
(
destination
,
originalData
.
getName
());
String
dataSetCode
=
dataSetInformation
.
getDataSetCode
();
File
finalDestinationFile
=
new
File
(
destination
,
renameToDataSetCode
?
dataSetCode
:
originalData
.
getName
());
final
String
destination
=
hostAwareFile
.
get
Path
();
final
File
destinationFile
=
new
File
(
destination
,
originalData
.
getName
());
final
String
dataSetCode
=
dataSetInformation
.
getDataSetCode
();
final
File
finalDestinationFile
=
new
File
(
destination
,
renameToDataSetCode
?
dataSetCode
:
originalData
.
getName
());
BooleanStatus
destinationExists
=
checkDestinationFileExistence
(
finalDestinationFile
,
host
,
sshCommandExecutor
);
...
...
@@ -144,13 +144,12 @@ public class Copier implements Serializable, IPostRegistrationDatasetHandler
IImmutableCopier
hardLinkMaker
=
immutableCopierFactory
.
create
(
rsyncExecutable
,
lnExecutable
);
status
=
hardLinkMaker
.
copyImmutably
(
originalData
,
destination
,
hardLinkMaker
.
copyImmutably
(
originalData
,
new
File
(
destination
)
,
renameToDataSetCode
?
dataSetCode
:
null
);
}
else
{
final
String
destinationRemotePath
=
hostAwareFile
.
getPath
();
status
=
copier
.
copyToRemote
(
originalData
,
destination
RemotePath
,
host
,
rsyncModule
,
copier
.
copyToRemote
(
originalData
,
destination
,
host
,
rsyncModule
,
rsyncPasswordFile
);
}
if
(
status
.
isError
())
...
...
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