| commit | ff7ab2595b8a96f0dfeb972e9fb88cb2c168d7c3 | [log] [tgz] |
|---|---|---|
| author | Uwe Stieber <uwe.stieber@windriver.com> | Wed Apr 23 14:47:53 2014 +0200 |
| committer | Uwe Stieber <uwe.stieber@windriver.com> | Wed Apr 23 14:47:53 2014 +0200 |
| tree | ba92def6e3096f0525d49e7375953f8111238613 | |
| parent | c76f302f7316839e2ed2e60f2730060359c26b05 [diff] |
Target Explorer: Path map service ignores rules with ID "Agent" when merging the maps
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/ChannelManager.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/ChannelManager.java index f8debdb..3ff3040 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/ChannelManager.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/ChannelManager.java
@@ -113,7 +113,7 @@ if (map != null && map.length > 0) { for (PathMapRule rule : map) { - if (rule.getID() == null || !rule.getID().startsWith(service.getClientID())) { + if (rule.getID() == null || !(!rule.getID().startsWith(service.getClientID()) && !"Agent".equals(rule.getID()))) { //$NON-NLS-1$ rules.add(rule); } }
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/delegates/Launch.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/delegates/Launch.java index 54b500d..5767644 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/delegates/Launch.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/delegates/Launch.java
@@ -167,7 +167,7 @@ if (oldMap != null && oldMap.length > 0) { for (PathMapRule rule : oldMap) { - if (rule.getID() == null || !rule.getID().startsWith(clientID)) { + if (rule.getID() == null || (!rule.getID().startsWith(clientID) && !"Agent".equals(rule.getID()))) { //$NON-NLS-1$ rules.add(rule); } }
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/internal/services/PathMapService.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/internal/services/PathMapService.java index 28a3f03..60450b6 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/internal/services/PathMapService.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/internal/services/PathMapService.java
@@ -336,7 +336,7 @@ if (map != null && map.length > 0) { for (PathMapRule rule : map) { - if (rule.getID() == null || !rule.getID().startsWith(getClientID())) { + if (rule.getID() == null || (!rule.getID().startsWith(getClientID()) && !"Agent".equals(rule.getID()))) { //$NON-NLS-1$ rules.add(rule); } }