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
a1fb5f10
Commit
a1fb5f10
authored
13 years ago
by
felmer
Browse files
Options
Downloads
Patches
Plain Diff
LMS-2760 fixed
SVN: 24281
parent
827ba079
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/ftp/FtpServer.java
+12
-7
12 additions, 7 deletions
...stemsx/cisd/openbis/dss/generic/server/ftp/FtpServer.java
with
12 additions
and
7 deletions
datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServer.java
+
12
−
7
View file @
a1fb5f10
...
...
@@ -294,6 +294,7 @@ public class FtpServer implements FileSystemFactory, org.apache.sshd.server.File
private
final
FileSystemView
fileView
;
private
final
String
path
;
private
final
List
<
InputStream
>
inputStreams
=
new
ArrayList
<
InputStream
>();
private
FtpFile
file
;
FileView
(
FileSystemView
fileView
,
String
path
)
{
...
...
@@ -303,13 +304,17 @@ public class FtpServer implements FileSystemFactory, org.apache.sshd.server.File
private
FtpFile
getFile
()
{
try
{
return
fileView
.
getFile
(
path
);
}
catch
(
FtpException
ex
)
if
(
file
==
null
)
{
throw
CheckedExceptionTunnel
.
wrapIfNecessary
(
ex
);
try
{
file
=
fileView
.
getFile
(
path
);
}
catch
(
FtpException
ex
)
{
throw
CheckedExceptionTunnel
.
wrapIfNecessary
(
ex
);
}
}
return
file
;
}
public
String
getAbsolutePath
()
...
...
@@ -406,9 +411,9 @@ public class FtpServer implements FileSystemFactory, org.apache.sshd.server.File
{
List
<
FtpFile
>
files
=
getFile
().
listFiles
();
List
<
SshFile
>
result
=
new
ArrayList
<
SshFile
>();
for
(
FtpFile
f
il
e
:
files
)
for
(
FtpFile
ch
il
d
:
files
)
{
result
.
add
(
new
FileView
(
fileView
,
f
il
e
.
getAbsolutePath
()));
result
.
add
(
new
FileView
(
fileView
,
ch
il
d
.
getAbsolutePath
()));
}
return
result
;
}
...
...
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