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/07/17 05:29:50 UTC
camel git commit: CAMEL-11524-resolve conflict
Repository: camel
Updated Branches:
refs/heads/camel-2.18.x 97484a96f -> acee0a5ce
CAMEL-11524-resolve conflict
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/acee0a5c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/acee0a5c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/acee0a5c
Branch: refs/heads/camel-2.18.x
Commit: acee0a5ce63bb98b57c590a746c7f660e855ba8d
Parents: 97484a9
Author: onders86 <on...@gmail.com>
Authored: Sat Jul 15 08:33:59 2017 +0300
Committer: onders86 <on...@gmail.com>
Committed: Mon Jul 17 08:28:20 2017 +0300
----------------------------------------------------------------------
.../component/file/GenericFileEndpoint.java | 4 ++-
.../file/FileConsumeDoneFileIssueTest.java | 30 ++++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/acee0a5c/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
index e251154..0fa5f8b 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
@@ -23,6 +23,8 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
@@ -1296,7 +1298,7 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
// we only support ${file:name} or ${file:name.noext} as dynamic placeholders for done files
String path = FileUtil.onlyPath(fileName);
- String onlyName = FileUtil.stripPath(fileName);
+ String onlyName = Matcher.quoteReplacement(FileUtil.stripPath(fileName));
pattern = pattern.replaceFirst("\\$\\{file:name\\}", onlyName);
pattern = pattern.replaceFirst("\\$simple\\{file:name\\}", onlyName);
http://git-wip-us.apache.org/repos/asf/camel/blob/acee0a5c/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java
index 4f05221..19cdd08 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java
@@ -89,6 +89,36 @@ public class FileConsumeDoneFileIssueTest extends ContextTestSupport {
assertFalse("Done file should be deleted", new File("target/done2/c.txt.done").exists());
}
+
+ public void testFileDoneFileNameContainingDollarSign() throws Exception {
+ NotifyBuilder notify = new NotifyBuilder(context).whenDone(3).create();
+
+ template.sendBodyAndHeader("file:target/done2", "A", Exchange.FILE_NAME, "$a$.txt");
+ template.sendBodyAndHeader("file:target/done2", "B", Exchange.FILE_NAME, "$b.txt");
+ template.sendBodyAndHeader("file:target/done2", "C", Exchange.FILE_NAME, "c$.txt");
+ template.sendBodyAndHeader("file:target/done2", "a", Exchange.FILE_NAME, "$a$.txt.done");
+ template.sendBodyAndHeader("file:target/done2", "b", Exchange.FILE_NAME, "$b.txt.done");
+ template.sendBodyAndHeader("file:target/done2", "c", Exchange.FILE_NAME, "c$.txt.done");
+
+ assertTrue("Done file should exists", new File("target/done2/$a$.txt.done").exists());
+ assertTrue("Done file should exists", new File("target/done2/$b.txt.done").exists());
+ assertTrue("Done file should exists", new File("target/done2/c$.txt.done").exists());
+
+ getMockEndpoint("mock:result").expectedBodiesReceivedInAnyOrder("A", "B", "C");
+
+ context.startRoute("bar");
+
+ assertMockEndpointsSatisfied();
+ assertTrue(notify.matchesMockWaitTime());
+
+ Thread.sleep(50);
+
+ // the done file should be deleted
+ assertFalse("Done file should be deleted", new File("target/done2/$a$.txt.done").exists());
+ assertFalse("Done file should be deleted", new File("target/done2/$b.txt.done").exists());
+ assertFalse("Done file should be deleted", new File("target/done2/c$.txt.done").exists());
+
+ }
@Override
protected RouteBuilder createRouteBuilder() throws Exception {