Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorustieber2011-05-11 06:40:13 -0400
committerustieber2011-05-11 06:40:13 -0400
commitaf121b71d340484580a2c1e47f70f1005db9cd9f (patch)
tree424822ff0265eb99880a1c2d591e660b40328ce9
parentd42dd34d8867dbb6a5518ea0546c4d7eba972d65 (diff)
downloadorg.eclipse.tcf-af121b71d340484580a2c1e47f70f1005db9cd9f.tar.gz
org.eclipse.tcf-af121b71d340484580a2c1e47f70f1005db9cd9f.tar.xz
org.eclipse.tcf-af121b71d340484580a2c1e47f70f1005db9cd9f.zip
Target Explorer: Static peer definitions can enforce "USR:<timestamp>" peer id generation
-rw-r--r--target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelRefreshService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelRefreshService.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelRefreshService.java
index 42801cb84..66d2cf084 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelRefreshService.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.locator/src/org/eclipse/tm/te/tcf/locator/services/LocatorModelRefreshService.java
@@ -161,12 +161,12 @@ public class LocatorModelRefreshService extends AbstractLocatorModelService impl
// Validate the id attribute. If not set, generate one.
String id = properties.getProperty(IPeer.ATTR_ID);
- if (id == null || (id != null & "".equals(id.trim()))) { //$NON-NLS-1$
+ if (id == null || (id != null && "".equals(id.trim())) || (id != null && "USR:".equals(id.trim()))) { //$NON-NLS-1$ //$NON-NLS-2$
String transport = properties.getProperty(IPeer.ATTR_TRANSPORT_NAME);
String host = properties.getProperty(IPeer.ATTR_IP_HOST);
String port = properties.getProperty(IPeer.ATTR_IP_PORT);
- if (transport != null && host != null) {
+ if (transport != null && host != null && !(id != null && "USR:".equals(id.trim()))) { //$NON-NLS-1$
id = transport.trim() + ":" + host.trim(); //$NON-NLS-1$
id += port != null ? ":" + port.trim() : ":1534"; //$NON-NLS-1$ //$NON-NLS-2$
} else {

Back to the top