Updated Branches: refs/heads/camel-2.11.x 726728e7f -> 0497a7489
CAMEL-6576: Fix a potential NPE Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0497a748 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0497a748 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0497a748 Branch: refs/heads/camel-2.11.x Commit: 0497a7489c3ddf923043b1b352b2a699492b3151 Parents: 726728e Author: cmueller <[email protected]> Authored: Thu Jul 25 22:52:44 2013 +0200 Committer: cmueller <[email protected]> Committed: Thu Jul 25 22:54:56 2013 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/camel/impl/DefaultCamelContext.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0497a748/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java index bb652d1..c4dd58a 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java @@ -2372,13 +2372,14 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon } public ManagementStrategy getManagementStrategy() { - if (!managementStrategyInitialized.get()) { - synchronized (managementStrategyInitialized) { + synchronized (managementStrategyInitialized) { + if (!managementStrategyInitialized.get()) { if (managementStrategyInitialized.compareAndSet(false, true)) { managementStrategy = createManagementStrategy(); } } } + return managementStrategy; }
