Updated Branches: refs/heads/camel-2.11.x 0acff1b0a -> 31960541c
CAMEL-6758: Null Pointer exception when removing SjmsComponent Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/31960541 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/31960541 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/31960541 Branch: refs/heads/camel-2.11.x Commit: 31960541c0d66ce262dc20b5a19cd46bd3c098b6 Parents: 0acff1b Author: cmueller <cmuel...@apache.org> Authored: Mon Sep 16 22:06:31 2013 +0200 Committer: cmueller <cmuel...@apache.org> Committed: Mon Sep 16 22:09:08 2013 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/camel/component/sjms/SjmsComponent.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/31960541/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java index f0d5957..d5edb94 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java @@ -136,7 +136,9 @@ public class SjmsComponent extends DefaultComponent implements HeaderFilterStrat @Override protected void doStop() throws Exception { - timedTaskManager.cancelTasks(); + if (timedTaskManager != null) { + timedTaskManager.cancelTasks(); + } if (getConnectionResource() != null) { if (getConnectionResource() instanceof ConnectionFactoryResource) {
