Merge remote-tracking branch 'origin/master'

This commit is contained in:
Grahame Grieve 2023-03-24 23:09:37 +11:00
commit b273d3f730
1 changed files with 3 additions and 1 deletions

View File

@ -9,6 +9,7 @@ import org.hl7.fhir.exceptions.FHIRException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@ -44,6 +45,7 @@ public class FTPClient {
@Getter
private final int port;
@Getter
private final String remoteSeparator;
@AllArgsConstructor(access = AccessLevel.PROTECTED)
@ -209,7 +211,7 @@ public class FTPClient {
if (path.startsWith(remoteSeparator)) {
throw new IllegalArgumentException("Absolute remote path is not permitted. Path: " + path);
}
return String.join(remoteSeparator, path);
return String.join(remoteSeparator, path.replace(File.separator, remoteSeparator));
}
/**