You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by on...@apache.org on 2017/06/25 16:37:32 UTC
[2/2] camel git commit: CAMEL-11437-resolve conflict
CAMEL-11437-resolve conflict
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/00332ef5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/00332ef5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/00332ef5
Branch: refs/heads/camel-2.19.x
Commit: 00332ef5a01ca92cd06ca074cc2ef19e2107682f
Parents: 45b18d9
Author: onders86 <on...@gmail.com>
Authored: Sun Jun 25 19:32:03 2017 +0300
Committer: onders86 <on...@gmail.com>
Committed: Sun Jun 25 19:32:03 2017 +0300
----------------------------------------------------------------------
.../file/strategy/GenericFileRenameProcessStrategy.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/00332ef5/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameProcessStrategy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameProcessStrategy.java b/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameProcessStrategy.java
index fbf684b..b02ce0a 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameProcessStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameProcessStrategy.java
@@ -66,11 +66,7 @@ public class GenericFileRenameProcessStrategy<T> extends GenericFileProcessStrat
if (failureRenamer != null) {
// create a copy and bind the file to the exchange to be used by the renamer to evaluate the file name
-<<<<<<< HEAD
Exchange copy = exchange.copy();
- file.bindToExchange(copy);
-=======
- Exchange copy = ExchangeHelper.createCopy(exchange, true);
FileEndpoint fe = null;
if (endpoint instanceof FileEndpoint) {
fe = (FileEndpoint)endpoint;
@@ -78,7 +74,6 @@ public class GenericFileRenameProcessStrategy<T> extends GenericFileProcessStrat
} else {
file.bindToExchange(copy);
}
->>>>>>> e3a1bdb... CAMEL-11437 - probeContentType and preMove attributes causes Exchange.FILE_CONTENT_TYPE to get dropped
// must preserve message id
copy.getIn().setMessageId(exchange.getIn().getMessageId());
copy.setExchangeId(exchange.getExchangeId());