Commit 91f5b94c authored by Jason Song's avatar Jason Song

try to solve defects found by coverity

parent 6a5f57e6
...@@ -21,8 +21,8 @@ public class ConfigService { ...@@ -21,8 +21,8 @@ public class ConfigService {
private static final ConfigService s_instance = new ConfigService(); private static final ConfigService s_instance = new ConfigService();
private PlexusContainer m_container; private PlexusContainer m_container;
private ConfigManager m_configManager; private volatile ConfigManager m_configManager;
private ConfigRegistry m_configRegistry; private volatile ConfigRegistry m_configRegistry;
private ConfigService() { private ConfigService() {
m_container = ContainerLoader.getDefaultContainer(); m_container = ContainerLoader.getDefaultContainer();
...@@ -128,8 +128,10 @@ public class ConfigService { ...@@ -128,8 +128,10 @@ public class ConfigService {
// for test only // for test only
static void setContainer(PlexusContainer m_container) { static void setContainer(PlexusContainer m_container) {
s_instance.m_container = m_container; synchronized (s_instance) {
s_instance.m_configManager = null; s_instance.m_container = m_container;
s_instance.m_configRegistry = null; s_instance.m_configManager = null;
s_instance.m_configRegistry = null;
}
} }
} }
...@@ -16,7 +16,7 @@ public abstract class Tracer { ...@@ -16,7 +16,7 @@ public abstract class Tracer {
private static final Logger logger = LoggerFactory.getLogger(Tracer.class); private static final Logger logger = LoggerFactory.getLogger(Tracer.class);
private static final MessageProducerManager NULL_MESSAGE_PRODUCER_MANAGER = private static final MessageProducerManager NULL_MESSAGE_PRODUCER_MANAGER =
new NullMessageProducerManager(); new NullMessageProducerManager();
private static MessageProducerManager producerManager; private static volatile MessageProducerManager producerManager;
private static Object lock = new Object(); private static Object lock = new Object();
static { static {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment