You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2013/07/25 22:53:04 UTC
git commit: CAMEL-6576: Fix a potential NPE
Updated Branches:
refs/heads/master 687edfcdc -> 22177229c
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/22177229
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/22177229
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/22177229
Branch: refs/heads/master
Commit: 22177229c2f5a1559f98ca6ed3d38e8004438d48
Parents: 687edfc
Author: cmueller <cm...@apache.org>
Authored: Thu Jul 25 22:52:44 2013 +0200
Committer: cmueller <cm...@apache.org>
Committed: Thu Jul 25 22:52:44 2013 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/impl/DefaultCamelContext.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/22177229/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 7e179d1..8a3091f 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
@@ -65,7 +65,6 @@ import org.apache.camel.ShutdownRoute;
import org.apache.camel.ShutdownRunningTask;
import org.apache.camel.StartupListener;
import org.apache.camel.StatefulService;
-import org.apache.camel.StreamCache;
import org.apache.camel.SuspendableService;
import org.apache.camel.TypeConverter;
import org.apache.camel.VetoCamelContextStartException;
@@ -2442,13 +2441,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;
}