Repository: camel Updated Branches: refs/heads/camel-2.14.x feb4ac9ad -> 48cc7d002
Fixed potential NPE Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/48cc7d00 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/48cc7d00 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/48cc7d00 Branch: refs/heads/camel-2.14.x Commit: 48cc7d002d8a3583957b2630edeead2e7639fc93 Parents: feb4ac9 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Mar 4 11:08:31 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Apr 17 08:08:12 2015 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/camel/impl/ScheduledPollConsumer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/48cc7d00/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java index e300d49..824742c 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java +++ b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java @@ -514,8 +514,10 @@ public abstract class ScheduledPollConsumer extends DefaultConsumer implements R @Override protected void doStop() throws Exception { - scheduler.unscheduleTask(); - ServiceHelper.stopAndShutdownServices(scheduler); + if (scheduler != null) { + scheduler.unscheduleTask(); + ServiceHelper.stopAndShutdownServices(scheduler); + } // clear counters backoffCounter = 0;
