Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--admin/findbugs-exclude.xml9
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/AbstractServiceManager.java2
2 files changed, 10 insertions, 1 deletions
diff --git a/admin/findbugs-exclude.xml b/admin/findbugs-exclude.xml
index 63c70c87a..509fddd77 100644
--- a/admin/findbugs-exclude.xml
+++ b/admin/findbugs-exclude.xml
@@ -23,4 +23,13 @@
<Match>
<Bug category="I18N"/>
</Match>
+
+ <!-- Ignore LI_LAZY_INIT_UPDATE_STATIC in Model.java -->
+ <Match>
+ <Bug pattern="LI_LAZY_INIT_UPDATE_STATIC"/>
+ <And>
+ <Class name="org.eclipse.tcf.te.tcf.locator.model.Model"/>
+ <Method name="initialize"/>
+ </And>
+ </Match>
</FindBugsFilter>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/AbstractServiceManager.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/AbstractServiceManager.java
index 2f24f1d06..0a16f32ac 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/AbstractServiceManager.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/AbstractServiceManager.java
@@ -339,7 +339,7 @@ public abstract class AbstractServiceManager {
boolean isInterface = serviceType.isInterface();
for (ServiceProxy proxy : proxies) {
if (proxy.isMatching(serviceType) && proxy.isEnabled(context)) {
- if (!isInterface && proxy.equals(serviceType)) {
+ if (!isInterface) {
V service = (V)proxy.getService(unique);
service.setId(proxy.getId());
return service;

Back to the top