diff options
| -rw-r--r-- | admin/findbugs-exclude.xml | 11 | ||||
| -rw-r--r-- | target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelRefreshService.java | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/admin/findbugs-exclude.xml b/admin/findbugs-exclude.xml index 5dd503c6f..f8f4bc5f5 100644 --- a/admin/findbugs-exclude.xml +++ b/admin/findbugs-exclude.xml @@ -25,9 +25,18 @@ <!-- Ignore NM_CLASS_NOT_EXCEPTION --> <Match> <Bug pattern="NM_CLASS_NOT_EXCEPTION"/> - <Class name="org.eclipse.tcf.te.tcf.core.va.ValueAddException"/> + <Or> + <Class name="org.eclipse.tcf.te.tcf.core.va.ValueAddException"/> + <Class name="org.eclipse.tcf.te.tcf.core.channelmanager.OpenChannelException"/> + </Or> </Match> + <!-- Ignore ES_COMPARING_PARAMETER_STRING_WITH_EQ --> + <Match> + <Bug pattern="ES_COMPARING_PARAMETER_STRING_WITH_EQ"/> + <Class name="org.eclipse.tcf.te.ui.terminals.manager.ConsoleManager"/> + </Match> + <!-- Ignore all SF_SWITCH_NO_DEFAULT violations --> <Match> <Bug pattern="SF_SWITCH_NO_DEFAULT"/> diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelRefreshService.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelRefreshService.java index e861620e3..2a0cbeca2 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelRefreshService.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelRefreshService.java @@ -318,7 +318,7 @@ public class LocatorModelRefreshService extends AbstractLocatorModelService impl String parentAgentId = locatorNode.getPeer().getAgentID(); String parentId = locatorNode.getPeer().getID(); - if (!agentId.equals(parentAgentId)) { + if (agentId != null && !agentId.equals(parentAgentId)) { ILocatorNode parent = locatorNode.getParent(ILocatorNode.class); ILocatorNode[] parentNodes = lkup .lkupLocatorNodeByAgentId(parent, agentId); |