Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GH-3370: Remove synchronized from RemoteFileUtils #3380

Merged
merged 4 commits into from
Sep 10, 2020
+23 −12
Merged

GH-3370: Remove synchronized from RemoteFileUtils #3380

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8e6483
GH-3370: Remove synchronized from RemoteFileUtils
artembilan Sep 10, 2020
59e7871
* Re-throw an exception in the `SftpSession.mkdir()`
artembilan Sep 10, 2020
b7ccb13
* Check `session.mkdir()` result in the
artembilan Sep 10, 2020
81871b5
* Fix mock test to return `true` for `mkdir` instead of `null`
artembilan Sep 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ation-file/src/main/java/org/springframework/integration/file/remote/RemoteFileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -46,7 +46,7 @@ private RemoteFileUtils() {
* @param logger The logger.
* @throws IOException Any IOException.
*/
public static synchronized <F> void makeDirectories(String path, Session<F> session, String remoteFileSeparator,
public static <F> void makeDirectories(String path, Session<F> session, String remoteFileSeparator,
Log logger) throws IOException {

if (!session.exists(path)) {
Expand Down
9 changes: 7 additions & 2 deletions ...egration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,13 @@ public boolean mkdir(String remoteDirectory) throws IOException {
try {
this.channel.mkdir(remoteDirectory);
}
catch (SftpException e) {
throw new NestedIOException("failed to create remote directory '" + remoteDirectory + "'.", e);
catch (SftpException ex) {
if (ex.id == ChannelSftp.SSH_FX_FAILURE && exists(remoteDirectory)) {
return false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should return true since it was a race condition. RFU currently discards the result; I think it should check it and throw an exception if false - see FtpSession where we simply delegate to the client.

}
else {
throw new NestedIOException("failed to create remote directory '" + remoteDirectory + "'.", ex);
}
}
return true;
}
Expand Down