From e89af266e6380d3ac9c2e5d3b835aacbd5993479 Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Fri, 12 Jun 2015 10:37:01 -0400 Subject: [PATCH 1/2] Bug 470081 - Fix connection type combo Change-Id: I7caf683725c9bb496cc476661b41d51a3be12b1b Signed-off-by: Greg Watson --- .../eclipse/remote/ui/widgets/RemoteConnectionWidget.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java index 4ef182576e2..cdcc15486fd 100644 --- a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java +++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java @@ -370,15 +370,15 @@ public class RemoteConnectionWidget extends Composite { } private IRemoteConnectionType getSelectedConnectionType() { - if (fDefaultConnectionType != null) { - return fDefaultConnectionType; - } if (fConnectionTypeCombo != null) { int selectionIndex = fConnectionTypeCombo.getSelectionIndex(); if (fConnectionTypes.size() > 0 && selectionIndex > 0) { return fConnectionTypes.get(selectionIndex - 1); } } + if (fDefaultConnectionType != null) { + return fDefaultConnectionType; + } return null; } From bc64e0a0172472742cb2fda07bbb573994171a32 Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Mon, 15 Jun 2015 10:58:45 -0400 Subject: [PATCH 2/2] Bug 470190 - remote connection service not cached correctly Change-Id: I3a1f3dfb90843fc6c651f8b9e8e83b0c3afa3767 Signed-off-by: Greg Watson --- .../src/org/eclipse/remote/internal/core/RemoteConnection.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnection.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnection.java index 548f8fd818d..09974fd7678 100644 --- a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnection.java +++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnection.java @@ -68,8 +68,7 @@ public class RemoteConnection implements IRemoteConnection { @SuppressWarnings("unchecked") @Override public T getService(Class service) { - String serviceName = service.getName(); - T obj = (T) servicesMap.get(serviceName); + T obj = (T) servicesMap.get(service); if (obj == null) { obj = connectionType.getConnectionService(this, service); if (obj != null) {