You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/09/19 23:08:27 UTC
svn commit: r1172820 - in /camel/branches/camel-2.8.x: ./
components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
Author: dkulp
Date: Mon Sep 19 21:08:27 2011
New Revision: 1172820
URL: http://svn.apache.org/viewvc?rev=1172820&view=rev
Log:
Merged revisions 1159325 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1159325 | davsclaus | 2011-08-18 13:44:17 -0400 (Thu, 18 Aug 2011) | 1 line
Fixed CS
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
Propchange: camel/branches/camel-2.8.x/
('svn:mergeinfo' removed)
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java?rev=1172820&r1=1172819&r2=1172820&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java (original)
+++ camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java Mon Sep 19 21:08:27 2011
@@ -93,12 +93,12 @@ public class SftpConfiguration extends R
return serverAliveCountMax;
}
- public void setChmod(String chmod) {
- this.chmod = chmod;
- }
-
- public String getChmod() {
- return chmod;
- }
-
+ public void setChmod(String chmod) {
+ this.chmod = chmod;
+ }
+
+ public String getChmod() {
+ return chmod;
+ }
+
}
Modified: camel/branches/camel-2.8.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.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java?rev=1172820&r1=1172819&r2=1172820&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java (original)
+++ camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java Mon Sep 19 21:08:27 2011
@@ -651,9 +651,9 @@ public class SftpOperations implements R
// parse to int using 8bit mode
int permissions = Integer.parseInt(mode, 8);
LOG.trace("Setting chmod: {} on file: ", mode, targetName);
- channel.chmod(permissions, targetName);
+ channel.chmod(permissions, targetName);
}
-
+
return true;
} catch (SftpException e) {