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 2011/12/12 13:10:30 UTC
svn commit: r1213205 - in /camel/branches/camel-2.7.x: ./
components/camel-quartz/src/main/java/org/apache/camel/component/quartz/
components/camel-quartz/src/test/java/org/apache/camel/component/quartz/
Author: davsclaus
Date: Mon Dec 12 12:10:30 2011
New Revision: 1213205
URL: http://svn.apache.org/viewvc?rev=1213205&view=rev
Log:
CAMEL-4769: Fixed issue configuring group name when using underscores, in camel-quartz.
Added:
camel/branches/camel-2.7.x/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzJobRouteUnderscoreTest.java
- copied unchanged from r1213201, camel/branches/camel-2.8.x/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzJobRouteUnderscoreTest.java
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 12 12:10:30 2011
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662,1204355,1205709,1208933,1210779,1210916,1211366,1211774,1211814
-/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659,1204338,1205412,1208930,1210771,1210830,1211363,1211773,1211811
+/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662,1204355,1205709,1208933,1210779,1210916,1211366,1211774,1211814,1213201
+/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659,1204338,1205412,1208930,1210771,1210830,1211363,1211773,1211811,1213197
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.7.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java?rev=1213205&r1=1213204&r2=1213205&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java (original)
+++ camel/branches/camel-2.7.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java Mon Dec 12 12:10:30 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;