diff options
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelRefreshService.java')
| -rw-r--r-- | target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelRefreshService.java | 12 |
1 files changed, 10 insertions, 2 deletions
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 f1bfca9db..16e5b6f4c 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 @@ -156,8 +156,16 @@ public class LocatorModelRefreshService extends AbstractLocatorModelService impl else { oldChildren.remove(peerNode); } - // Merge user configured properties between the peers - model.getService(ILocatorModelUpdateService.class).mergeUserDefinedAttributes(peerNode, peer, false); + + if (peerNode.getPeer() != peer) { + if ("RemotePeer".equals(peerNode.getPeer().getClass().getSimpleName())) { //$NON-NLS-1$ + peerNode.setProperty(IPeerModelProperties.PROP_INSTANCE, peer); + } else { + // Merge user configured properties between the peers + model.getService(ILocatorModelUpdateService.class).mergeUserDefinedAttributes(peerNode, peer, false); + } + } + // Validate the peer node before adding peerNode = model.validatePeerNodeForAdd(peerNode); if (peerNode != null) { |