Updated Branches: refs/heads/master 4737cc841 -> ed0ca3d31
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/ed0ca3d3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ed0ca3d3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ed0ca3d3 Branch: refs/heads/master Commit: ed0ca3d31a26e5ade7b9cdd39817cc6a59e1958b Parents: 4737cc8 Author: cmueller <cmuel...@apache.org> Authored: Mon Sep 16 22:06:31 2013 +0200 Committer: cmueller <cmuel...@apache.org> Committed: Mon Sep 16 22:07:57 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/ed0ca3d3/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 869d5f4..8489d77 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 @@ -140,7 +140,9 @@ public class SjmsComponent extends UriEndpointComponent implements HeaderFilterS @Override protected void doStop() throws Exception { - timedTaskManager.cancelTasks(); + if (timedTaskManager != null) { + timedTaskManager.cancelTasks(); + } if (getConnectionResource() != null) { if (getConnectionResource() instanceof ConnectionFactoryResource) {
