TCF Core: fixed high priority FindBugs warnings

3 files changed, 9 insertions, 6 deletions

diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFAnnotationProvider.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFAnnotationProvider.java
index 4669dc615..5e62ade31 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFAnnotationProvider.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFAnnotationProvider.java
@@ -37,7 +37,7 @@ public class TCFAnnotationProvider {
     public static ITCFAnnotationProvider getAnnotationProvider(Object selection) {
         if (selection == null) return null;
         if (providers == null) {
-            providers = new  ArrayList<ITCFAnnotationProvider>();
+            ArrayList<ITCFAnnotationProvider> list  = new  ArrayList<ITCFAnnotationProvider>();
             try {
                 IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(
                         Activator.PLUGIN_ID, "annotation_provider"); //$NON-NLS-1$
@@ -51,7 +51,7 @@ public class TCFAnnotationProvider {
                             String nm = e[j].getName();
                             if (nm.equals("class")) { //$NON-NLS-1$
                                 Class<?> c = bundle.loadClass(e[j].getAttribute("name")); //$NON-NLS-1$
-                                providers.add((ITCFAnnotationProvider)c.newInstance());
+                                list.add((ITCFAnnotationProvider)c.newInstance());
                             }
                         }
                     }
@@ -63,6 +63,7 @@ public class TCFAnnotationProvider {
             catch (Exception x) {
                 Activator.log("Cannot access annotation provider extension points", x);
             }
+            providers = list;
         }
         for (ITCFAnnotationProvider p : providers) {
             if (p.isSupportedSelection(selection)) return p;
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFPresentationProvider.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFPresentationProvider.java
index 5940d3cc3..d6153fded 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFPresentationProvider.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFPresentationProvider.java
@@ -30,7 +30,7 @@ public class TCFPresentationProvider {
 
     public static Iterable<ITCFPresentationProvider> getPresentationProviders() {
         if (providers == null) {
-            providers = new  ArrayList<ITCFPresentationProvider>();
+            ArrayList<ITCFPresentationProvider> list = new ArrayList<ITCFPresentationProvider>();
             try {
                 IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(
                         Activator.PLUGIN_ID, "presentation_provider"); //$NON-NLS-1$
@@ -44,7 +44,7 @@ public class TCFPresentationProvider {
                             String nm = e[j].getName();
                             if (nm.equals("class")) { //$NON-NLS-1$
                                 Class<?> c = bundle.loadClass(e[j].getAttribute("name")); //$NON-NLS-1$
-                                providers.add((ITCFPresentationProvider)c.newInstance());
+                                list.add((ITCFPresentationProvider)c.newInstance());
                             }
                         }
                     }
@@ -56,6 +56,7 @@ public class TCFPresentationProvider {
             catch (Exception x) {
                 Activator.log("Cannot access presentation provider extension points", x);
             }
+            providers = list;
         }
         return providers;
     }
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFPrettyExpressionProvider.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFPrettyExpressionProvider.java
index 49d1c02e9..1f80da13f 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFPrettyExpressionProvider.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFPrettyExpressionProvider.java
@@ -35,7 +35,7 @@ public class TCFPrettyExpressionProvider {
 
     public static Collection<ITCFPrettyExpressionProvider> getProviders() {
         if (providers == null) {
-            providers = new  ArrayList<ITCFPrettyExpressionProvider>();
+            ArrayList<ITCFPrettyExpressionProvider> list = new ArrayList<ITCFPrettyExpressionProvider>();
             try {
                 IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(
                         Activator.PLUGIN_ID, "pretty_expression_provider"); //$NON-NLS-1$
@@ -49,7 +49,7 @@ public class TCFPrettyExpressionProvider {
                             String nm = e[j].getName();
                             if (nm.equals("class")) { //$NON-NLS-1$
                                 Class<?> c = bundle.loadClass(e[j].getAttribute("name")); //$NON-NLS-1$
-                                providers.add((ITCFPrettyExpressionProvider)c.newInstance());
+                                list.add((ITCFPrettyExpressionProvider)c.newInstance());
                             }
                         }
                     }
@@ -61,6 +61,7 @@ public class TCFPrettyExpressionProvider {
             catch (Exception x) {
                 Activator.log("Cannot access pretty expression provider extension points", x);
             }
+            providers = list;
         }
         return providers;
     }