Author: hadrian
Date: Sun Apr 1 02:32:27 2012
New Revision: 1307999
URL: http://svn.apache.org/viewvc?rev=1307999&view=rev
Log:
Merged revisions 1294481 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1294481 | hadrian | 2012-02-28 01:34:42 -0500 (Tue, 28 Feb 2012) | 1 line
Checkstyle fix
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java
Propchange: camel/branches/camel-2.9.x/
('svn:mergeinfo' removed)
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java?rev=1307999&r1=1307998&r2=1307999&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java
Sun Apr 1 02:32:27 2012
@@ -248,7 +248,7 @@ public class ScpOperations implements Re
writeFile(filename.substring(pos + 1), data, os, is);
- os.write(("E\n").getBytes());
+ os.write("E\n".getBytes());
os.flush();
is.read();
} else {