Updated Branches: refs/heads/camel-2.10.x 4271a36ad -> 53c42f210
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/53c42f21 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/53c42f21 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/53c42f21 Branch: refs/heads/camel-2.10.x Commit: 53c42f210027ec3932fb3bbe179da27b879cfbc2 Parents: 4271a36 Author: cmueller <[email protected]> Authored: Thu Jul 25 22:52:44 2013 +0200 Committer: cmueller <[email protected]> Committed: Thu Jul 25 22:56:55 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/53c42f21/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 9ff086b..b665835 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 @@ -2334,13 +2334,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; }
