Author: ningjiang Date: Fri Sep 7 14:53:37 2012 New Revision: 1382056 URL: http://svn.apache.org/viewvc?rev=1382056&view=rev Log: Merged revisions 1382047 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1382047 | ningjiang | 2012-09-07 22:33:40 +0800 (Fri, 07 Sep 2012) | 9 lines Merged revisions 1382039 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1382039 | ningjiang | 2012-09-07 22:20:15 +0800 (Fri, 07 Sep 2012) | 1 line CAMEL-5574 fixes the camel-sftp's stepwise behavior issue with thanks to Aki ........ ................ Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1382039 Merged /camel/branches/camel-2.10.x:r1382047 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java?rev=1382056&r1=1382055&r2=1382056&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java (original) +++ camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java Fri Sep 7 14:53:37 2012 @@ -26,6 +26,7 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; import java.util.Vector; +import java.util.regex.Pattern; import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.JSch; @@ -55,6 +56,7 @@ import static org.apache.camel.util.Obje */ public class SftpOperations implements RemoteFileOperations<ChannelSftp.LsEntry> { private static final transient Logger LOG = LoggerFactory.getLogger(SftpOperations.class); + private static final Pattern UP_DIR_PATTERN = Pattern.compile("/[^/]+"); private SftpEndpoint endpoint; private ChannelSftp channel; private Session session; @@ -388,6 +390,15 @@ public class SftpOperations implements R doChangeDirectory(path); return; } + if (getCurrentDirectory().startsWith(path)) { + // use relative path + String p = getCurrentDirectory().substring(path.length()); + if (p.length() == 0) { + return; + } + // the first character must be '/' and hence removed + path = UP_DIR_PATTERN.matcher(p).replaceAll("/..").substring(1); + } // if it starts with the root path then a little special handling for that if (FileUtil.hasLeadingSeparator(path)) { @@ -415,7 +426,6 @@ public class SftpOperations implements R if (path == null || ".".equals(path) || ObjectHelper.isEmpty(path)) { return; } - LOG.trace("Changing directory: {}", path); try { channel.cd(path); @@ -477,6 +487,7 @@ public class SftpOperations implements R @SuppressWarnings("unchecked") private boolean retrieveFileToStreamInBody(String name, Exchange exchange) throws GenericFileOperationFailedException { OutputStream os = null; + String currentDir = null; try { os = new ByteArrayOutputStream(); GenericFile<ChannelSftp.LsEntry> target = @@ -485,7 +496,6 @@ public class SftpOperations implements R target.setBody(os); String remoteName = name; - String currentDir = null; if (endpoint.getConfiguration().isStepwise()) { // remember current directory currentDir = getCurrentDirectory(); @@ -504,11 +514,6 @@ public class SftpOperations implements R InputStream is = channel.get(remoteName); IOHelper.copyAndCloseInput(is, os); - // change back to current directory - if (endpoint.getConfiguration().isStepwise()) { - changeCurrentDirectory(currentDir); - } - return true; } catch (IOException e) { throw new GenericFileOperationFailedException("Cannot retrieve file: " + name, e); @@ -516,6 +521,10 @@ public class SftpOperations implements R throw new GenericFileOperationFailedException("Cannot retrieve file: " + name, e); } finally { IOHelper.close(os, "retrieve: " + name, LOG); + // change back to current directory if we changed directory + if (currentDir != null) { + changeCurrentDirectory(currentDir); + } } } @@ -562,13 +571,12 @@ public class SftpOperations implements R } catch (Exception e) { throw new GenericFileOperationFailedException("Cannot create new local work file: " + local); } - + String currentDir = null; try { // store the java.io.File handle as the body file.setBody(local); String remoteName = name; - String currentDir = null; if (endpoint.getConfiguration().isStepwise()) { // remember current directory currentDir = getCurrentDirectory(); @@ -585,11 +593,6 @@ public class SftpOperations implements R channel.get(remoteName, os); - // change back to current directory - if (endpoint.getConfiguration().isStepwise()) { - changeCurrentDirectory(currentDir); - } - } catch (SftpException e) { LOG.trace("Error occurred during retrieving file: {} to local directory. Deleting local work file: {}", name, temp); // failed to retrieve the file so we need to close streams and delete in progress file @@ -602,6 +605,11 @@ public class SftpOperations implements R throw new GenericFileOperationFailedException("Cannot retrieve file: " + name, e); } finally { IOHelper.close(os, "retrieve: " + name, LOG); + + // change back to current directory if we changed directory + if (currentDir != null) { + changeCurrentDirectory(currentDir); + } } LOG.debug("Retrieve file to local work file result: true");
