Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2014-04-23 08:47:53 -0400
committerUwe Stieber2014-04-23 08:47:53 -0400
commitff7ab2595b8a96f0dfeb972e9fb88cb2c168d7c3 (patch)
treeba92def6e3096f0525d49e7375953f8111238613
parentc76f302f7316839e2ed2e60f2730060359c26b05 (diff)
downloadorg.eclipse.tcf-ff7ab2595b8a96f0dfeb972e9fb88cb2c168d7c3.tar.gz
org.eclipse.tcf-ff7ab2595b8a96f0dfeb972e9fb88cb2c168d7c3.tar.xz
org.eclipse.tcf-ff7ab2595b8a96f0dfeb972e9fb88cb2c168d7c3.zip
Target Explorer: Path map service ignores rules with ID "Agent" when merging the maps
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/ChannelManager.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/delegates/Launch.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/internal/services/PathMapService.java2
3 files changed, 3 insertions, 3 deletions
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 f8debdb27..3ff304057 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 @@ public final class ChannelManager extends PlatformObject implements IChannelMana
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 54b500d86..576764463 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 @@ public final class Launch extends TCFLaunch {
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 28a3f038c..60450b6b0 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 @@ public class PathMapService extends AbstractService implements IPathMapService {
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);
}
}

Back to the top