Updated Branches: refs/heads/camel-2.12.x cbb4ad2a5 -> b0adea066 refs/heads/master a976a730e -> 6733d2120
CAMEL-7132: quartz/quartz2 component should use avoid null management name if JMX not enabled. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6733d212 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6733d212 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6733d212 Branch: refs/heads/master Commit: 6733d212003d11ff13cf33ac0e6e1f95fc7218e5 Parents: a976a73 Author: Claus Ibsen <[email protected]> Authored: Tue Feb 4 09:36:11 2014 +0100 Committer: Claus Ibsen <[email protected]> Committed: Tue Feb 4 09:36:11 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/camel/component/quartz/QuartzComponent.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6733d212/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 26e6b14..d69ccfe 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 @@ -548,7 +548,8 @@ public class QuartzComponent extends DefaultComponent implements StartupListener // register current camel context to scheduler so we can look it up when jobs is being triggered // must use management name as it should be unique in the same JVM - scheduler.getContext().put(QuartzConstants.QUARTZ_CAMEL_CONTEXT + "-" + getCamelContext().getManagementName(), getCamelContext()); + String uid = QuartzHelper.getQuartzContextName(getCamelContext()); + scheduler.getContext().put(QuartzConstants.QUARTZ_CAMEL_CONTEXT + "-" + uid, getCamelContext()); // store Camel job counter AtomicInteger number = (AtomicInteger) scheduler.getContext().get("CamelJobs");
