Author: davsclaus
Date: Wed Apr 24 09:43:34 2013
New Revision: 1471332
URL: http://svn.apache.org/r1471332
Log:
CAMEL-6293: Ftp/ftps consumer and producer adds headers with ftp client reply
code/string when downloading or uploading a file.
Added:
camel/branches/camel-2.11.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConstants.java
- copied unchanged from r1471330,
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConstants.java
camel/branches/camel-2.11.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerReplyStringTest.java
- copied unchanged from r1471330,
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerReplyStringTest.java
camel/branches/camel-2.11.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerReplyStringTest.java
- copied unchanged from r1471330,
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerReplyStringTest.java
Modified:
camel/branches/camel-2.11.x/ (props changed)
camel/branches/camel-2.11.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
Propchange: camel/branches/camel-2.11.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1471330
Propchange: camel/branches/camel-2.11.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr 24 09:43:34 2013
@@ -1 +1 @@
-/camel/trunk:1-1468763,1469704,1469819,1470420,1470426-1470427,1470429,1470508,1471293
+/camel/trunk:1-1468763,1469704,1469819,1470420,1470426-1470427,1470429,1470508,1471293,1471330
Modified:
camel/branches/camel-2.11.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java?rev=1471332&r1=1471331&r2=1471332&view=diff
==============================================================================
---
camel/branches/camel-2.11.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
(original)
+++
camel/branches/camel-2.11.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
Wed Apr 24 09:43:34 2013
@@ -352,6 +352,10 @@ public class FtpOperations implements Re
result = client.retrieveFile(remoteName, os);
}
+ // store client reply information after the operation
+ exchange.getIn().setHeader(FtpConstants.FTP_REPLY_CODE,
client.getReplyCode());
+ exchange.getIn().setHeader(FtpConstants.FTP_REPLY_STRING,
client.getReplyString());
+
// change back to current directory
if (endpoint.getConfiguration().isStepwise()) {
changeCurrentDirectory(currentDir);
@@ -435,6 +439,10 @@ public class FtpOperations implements Re
log.trace("Client retrieveFile: {}", remoteName);
result = client.retrieveFile(remoteName, os);
+ // store client reply information after the operation
+ exchange.getIn().setHeader(FtpConstants.FTP_REPLY_CODE,
client.getReplyCode());
+ exchange.getIn().setHeader(FtpConstants.FTP_REPLY_STRING,
client.getReplyString());
+
// change back to current directory
if (endpoint.getConfiguration().isStepwise()) {
changeCurrentDirectory(currentDir);
@@ -567,6 +575,10 @@ public class FtpOperations implements Re
new Object[]{TimeUtils.printDuration(watch.taken()),
watch.taken(), targetName, answer});
}
+ // store client reply information after the operation
+ exchange.getIn().setHeader(FtpConstants.FTP_REPLY_CODE,
client.getReplyCode());
+ exchange.getIn().setHeader(FtpConstants.FTP_REPLY_STRING,
client.getReplyString());
+
return answer;
} catch (IOException e) {
