Fix unsafe static field initialization

28 files changed, 28 insertions, 28 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/src/org/eclipse/tcf/te/core/cdt/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/src/org/eclipse/tcf/te/core/cdt/activator/CoreBundleActivator.java
index 0cadf6a8f..c1b05a8f2 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/src/org/eclipse/tcf/te/core/cdt/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/src/org/eclipse/tcf/te/core/cdt/activator/CoreBundleActivator.java
@@ -20,7 +20,7 @@ public class CoreBundleActivator implements BundleActivator {
 	// The bundle context

 	private static BundleContext context;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * Returns the bundle context

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.core/src/org/eclipse/tcf/te/core/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tcf.te.core/src/org/eclipse/tcf/te/core/activator/CoreBundleActivator.java
index 58c9765be..619f029fe 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.core/src/org/eclipse/tcf/te/core/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.core/src/org/eclipse/tcf/te/core/activator/CoreBundleActivator.java
@@ -20,7 +20,7 @@ public class CoreBundleActivator implements BundleActivator {
 	// The bundle context

 	private static BundleContext context;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * Returns the bundle context

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/activator/CoreBundleActivator.java
index 69fef9224..d8025439b 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/activator/CoreBundleActivator.java
@@ -23,7 +23,7 @@ public class CoreBundleActivator implements BundleActivator {
 	// The scoped preferences instance

 	private static ScopedEclipsePreferences scopedPreferences = null;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * Returns the bundle context

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/activator/UIPlugin.java
index 14136628f..f61e877f9 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/activator/UIPlugin.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/activator/UIPlugin.java
@@ -28,7 +28,7 @@ public class UIPlugin extends AbstractUIPlugin {
 	// The shared instance

 	private static UIPlugin plugin;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * The constructor

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.concurrent/src/org/eclipse/tcf/te/runtime/concurrent/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.concurrent/src/org/eclipse/tcf/te/runtime/concurrent/activator/CoreBundleActivator.java
index fe896a055..718c68d8f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.concurrent/src/org/eclipse/tcf/te/runtime/concurrent/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.concurrent/src/org/eclipse/tcf/te/runtime/concurrent/activator/CoreBundleActivator.java
@@ -20,7 +20,7 @@ public class CoreBundleActivator implements BundleActivator {
 	// The bundle context

 	private static BundleContext context;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * Returns the bundle context

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/activator/CoreBundleActivator.java
index da0130667..7c30fda15 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/activator/CoreBundleActivator.java
@@ -20,7 +20,7 @@ public class CoreBundleActivator implements BundleActivator {
 	// The bundle context

 	private static BundleContext context;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * Returns the bundle context

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/activator/CoreBundleActivator.java
index 7f19640cb..83945d82b 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/activator/CoreBundleActivator.java
@@ -20,7 +20,7 @@ public class CoreBundleActivator implements BundleActivator {
 	// The bundle context

 	private static BundleContext context;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * Returns the bundle context

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/activator/CoreBundleActivator.java
index 6744469e0..c373a2de3 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/activator/CoreBundleActivator.java
@@ -20,7 +20,7 @@ public class CoreBundleActivator implements BundleActivator {
 	// The bundle context

 	private static BundleContext context;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * Returns the bundle context

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime/src/org/eclipse/tcf/te/runtime/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime/src/org/eclipse/tcf/te/runtime/activator/CoreBundleActivator.java
index 6a3a94656..0788846c7 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime/src/org/eclipse/tcf/te/runtime/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime/src/org/eclipse/tcf/te/runtime/activator/CoreBundleActivator.java
@@ -20,7 +20,7 @@ public class CoreBundleActivator implements BundleActivator {
 	// The bundle context

 	private static BundleContext context;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * Returns the bundle context

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/src/org/eclipse/tcf/te/tcf/core/scripting/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/src/org/eclipse/tcf/te/tcf/core/scripting/activator/CoreBundleActivator.java
index bf314f308..83ee07ef0 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/src/org/eclipse/tcf/te/tcf/core/scripting/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/src/org/eclipse/tcf/te/tcf/core/scripting/activator/CoreBundleActivator.java
@@ -20,7 +20,7 @@ public class CoreBundleActivator implements BundleActivator {
 	// The bundle context

 	private static BundleContext context;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * Returns the bundle context

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/activator/CoreBundleActivator.java
index e8ac5c042..98f1884d5 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/activator/CoreBundleActivator.java
@@ -22,7 +22,7 @@ public class CoreBundleActivator implements BundleActivator {
 	// The bundle context
 	private static BundleContext context;
 	// The trace handler instance
-	private static TraceHandler traceHandler;
+	private static volatile TraceHandler traceHandler;
 
 	/**
 	 * Returns the bundle context
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/activator/CoreBundleActivator.java
index 0f5704f20..34002c61f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/activator/CoreBundleActivator.java
@@ -20,7 +20,7 @@ public class CoreBundleActivator implements BundleActivator {
 	// The bundle context

 	private static BundleContext context;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * Returns the bundle context

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/activator/UIPlugin.java
index b45c16f6e..583427796 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/activator/UIPlugin.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/activator/UIPlugin.java
@@ -23,7 +23,7 @@ public class UIPlugin extends AbstractUIPlugin {
 	// The shared instance

 	private static UIPlugin plugin;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * The constructor

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/activator/CoreBundleActivator.java
index 524f776aa..2d8116d40 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/activator/CoreBundleActivator.java
@@ -23,7 +23,7 @@ public class CoreBundleActivator extends Plugin {
 	// The shared instance
 	private static CoreBundleActivator plugin;
 	// The trace handler instance
-	private static TraceHandler traceHandler;
+	private static volatile TraceHandler traceHandler;
 
 	/**
 	 * Returns the shared instance
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/activator/CoreBundleActivator.java
index 340226d45..6065ba4e1 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/activator/CoreBundleActivator.java
@@ -23,7 +23,7 @@ public class CoreBundleActivator extends Plugin {
 	// The scoped preferences instance

 	private static ScopedEclipsePreferences scopedPreferences = null;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * Returns the shared instance

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/activator/CoreBundleActivator.java
index 87469dd4d..55c8b8f11 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/activator/CoreBundleActivator.java
@@ -20,7 +20,7 @@ public class CoreBundleActivator implements BundleActivator {
 	// The bundle context

 	private static BundleContext context;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * Returns the bundle context

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.services.contexts/src/org/eclipse/tcf/te/tcf/services/contexts/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.services.contexts/src/org/eclipse/tcf/te/tcf/services/contexts/activator/CoreBundleActivator.java
index 7ae6cae51..978ae2f6f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.services.contexts/src/org/eclipse/tcf/te/tcf/services/contexts/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.services.contexts/src/org/eclipse/tcf/te/tcf/services/contexts/activator/CoreBundleActivator.java
@@ -20,7 +20,7 @@ public class CoreBundleActivator implements BundleActivator {
 	// The bundle context

 	private static BundleContext context;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * Returns the bundle context

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/src/org/eclipse/tcf/te/tcf/terminals/core/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/src/org/eclipse/tcf/te/tcf/terminals/core/activator/CoreBundleActivator.java
index 359d80934..4fd82e3f3 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/src/org/eclipse/tcf/te/tcf/terminals/core/activator/CoreBundleActivator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/src/org/eclipse/tcf/te/tcf/terminals/core/activator/CoreBundleActivator.java
@@ -20,7 +20,7 @@ public class CoreBundleActivator implements BundleActivator {
 	// The bundle context

 	private static BundleContext context;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * Returns the bundle context

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/activator/UIPlugin.java
index 56fc1ef55..cf0f6eec9 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/activator/UIPlugin.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/src/org/eclipse/tcf/te/tcf/terminals/ui/activator/UIPlugin.java
@@ -23,7 +23,7 @@ public class UIPlugin extends AbstractUIPlugin {
 	// The shared instance

 	private static UIPlugin plugin;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * The constructor

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/activator/UIPlugin.java
index ef303834d..2fd1b7c30 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/activator/UIPlugin.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/activator/UIPlugin.java
@@ -24,7 +24,7 @@ public class UIPlugin extends AbstractUIPlugin {
 	// The shared instance
 	private static UIPlugin plugin;
 	// The trace handler instance
-	private static TraceHandler traceHandler;
+	private static volatile TraceHandler traceHandler;
 
 	/**
 	 * The constructor
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/activator/UIPlugin.java
index 49c126ca8..5d82f92ec 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/activator/UIPlugin.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/activator/UIPlugin.java
@@ -15,7 +15,7 @@ public class UIPlugin extends AbstractUIPlugin {
 	private static UIPlugin plugin;

 

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * The constructor

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/activator/UIPlugin.java
index f7d0a979e..f8e7588b1 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/activator/UIPlugin.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.serial/src/org/eclipse/tcf/te/ui/terminals/serial/activator/UIPlugin.java
@@ -23,7 +23,7 @@ public class UIPlugin extends AbstractUIPlugin {
 	// The shared instance

 	private static UIPlugin plugin;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * The constructor

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/activator/UIPlugin.java
index e895b44ac..2923c99f2 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/activator/UIPlugin.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/activator/UIPlugin.java
@@ -23,7 +23,7 @@ public class UIPlugin extends AbstractUIPlugin {
 	// The shared instance

 	private static UIPlugin plugin;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * The constructor

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/activator/UIPlugin.java
index e062d0bf1..b4deff274 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/activator/UIPlugin.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/activator/UIPlugin.java
@@ -24,7 +24,7 @@ public class UIPlugin extends AbstractUIPlugin {
 	// The shared instance

 	private static UIPlugin plugin;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * The constructor

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/activator/UIPlugin.java
index 6c9e4a4eb..9f378da5c 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/activator/UIPlugin.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/activator/UIPlugin.java
@@ -32,7 +32,7 @@ public class UIPlugin extends AbstractUIPlugin {
 	// The scoped preferences instance

 	private static ScopedEclipsePreferences scopedPreferences = null;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * The constructor

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/activator/UIPlugin.java
index ca6cb2d44..d8e25304d 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/activator/UIPlugin.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/activator/UIPlugin.java
@@ -26,7 +26,7 @@ public class UIPlugin extends AbstractUIPlugin {
 	// The shared instance

 	private static UIPlugin plugin;

 	// The trace handler instance

-	private static TraceHandler traceHandler;

+	private static volatile TraceHandler traceHandler;

 

 	/**

 	 * The constructor

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/activator/UIPlugin.java
index 67ceda4b2..84ca55293 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/activator/UIPlugin.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/activator/UIPlugin.java
@@ -30,7 +30,7 @@ public class UIPlugin extends AbstractUIPlugin {
 	// The shared instance
 	private static UIPlugin plugin;
 	// The trace handler instance
-	private static TraceHandler traceHandler;
+	private static volatile TraceHandler traceHandler;
 
 	// The global window listener instance
 	private IWindowListener windowListener;
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/activator/UIPlugin.java
index 9e0371890..786455c5e 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/activator/UIPlugin.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/activator/UIPlugin.java
@@ -28,7 +28,7 @@ public class UIPlugin extends AbstractUIPlugin {
 	// The shared instance
 	private static UIPlugin plugin;
 	// The trace handler instance
-	private static TraceHandler traceHandler;
+	private static volatile TraceHandler traceHandler;
 
 	/**
 	 * The constructor