Author: davsclaus
Date: Mon Dec 12 12:05:12 2011
New Revision: 1213201
URL: http://svn.apache.org/viewvc?rev=1213201&view=rev
Log:
CAMEL-4769: Fixed issue configuring group name when using underscores, in
camel-quartz.
Added:
camel/branches/camel-2.8.x/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzJobRouteUnderscoreTest.java
- copied unchanged from r1213197,
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzJobRouteUnderscoreTest.java
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 12 12:05:12 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202214-1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408
+/camel/trunk:1202148,1202167,1202204-1202206,1202214-1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408,1213197
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java?rev=1213201&r1=1213200&r2=1213201&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
Mon Dec 12 12:05:12 2011
@@ -98,6 +98,11 @@ public class QuartzComponent extends Def
String cron = getAndRemoveParameter(parameters, "cron", String.class);
Boolean fireNow = getAndRemoveParameter(parameters, "fireNow",
Boolean.class, Boolean.FALSE);
+ // host can be null if the uri did contain invalid host characters
such as an underscore
+ if (host == null) {
+ host = ObjectHelper.before(remaining, "/");
+ }
+
// group can be optional, if so set it to Camel
String name;
String group;