You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/10/12 12:05:18 UTC
[3/5] git commit: CAMEL-6851: Fixed allowing underscore in trigger
name in quartz endpoint. Thanks to Tom Cunningham for patch
CAMEL-6851: Fixed allowing underscore in trigger name in quartz endpoint. Thanks to Tom Cunningham for patch
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/de8fe183
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/de8fe183
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/de8fe183
Branch: refs/heads/camel-2.12.x
Commit: de8fe1837d6efc1922761a2e26d53a45ca183d2f
Parents: 4eaf3f7
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Oct 12 11:49:43 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Oct 12 12:04:38 2013 +0200
----------------------------------------------------------------------
.../camel/component/quartz/QuartzComponent.java | 3 ++
.../quartz/QuartUnderscoreTimerNameTest.java | 43 ++++++++++++++++++++
2 files changed, 46 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/de8fe183/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
index 44cfa36..5c2a98e 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
@@ -109,6 +109,9 @@ public class QuartzComponent extends DefaultComponent implements StartupListener
// host can be null if the uri did contain invalid host characters such as an underscore
if (host == null) {
host = ObjectHelper.before(remaining, "/");
+ if (host == null) {
+ host = remaining;
+ }
}
// group can be optional, if so set it to Camel
http://git-wip-us.apache.org/repos/asf/camel/blob/de8fe183/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartUnderscoreTimerNameTest.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartUnderscoreTimerNameTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartUnderscoreTimerNameTest.java
new file mode 100644
index 0000000..de05229
--- /dev/null
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartUnderscoreTimerNameTest.java
@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.quartz;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class QuartUnderscoreTimerNameTest extends CamelTestSupport {
+
+ @Test
+ public void testQuartzCronRouteUnderscore() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMinimumMessageCount(1);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ public void configure() {
+ from("quartz://my_group?cron=0/1+*+*+*+*+?").to("mock:result");
+ }
+ };
+ }
+
+}