From ac2830953d854b577503d7116a8d1a8338d8e527 Mon Sep 17 00:00:00 2001 From: "Watson, Gregory" Date: Wed, 18 Jan 2017 21:49:50 -0500 Subject: [PATCH] Fix check for existing proxy. Change-Id: I3e6357f6f9671a2c411b873169d73041442285c3 Signed-off-by: Watson, Gregory --- bundles/org.eclipse.remote.proxy.core/bootstrap.sh | 4 ++-- .../remote/internal/proxy/core/ProxyConnectionBootstrap.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bundles/org.eclipse.remote.proxy.core/bootstrap.sh b/bundles/org.eclipse.remote.proxy.core/bootstrap.sh index a02a2332845..c3be670803d 100644 --- a/bundles/org.eclipse.remote.proxy.core/bootstrap.sh +++ b/bundles/org.eclipse.remote.proxy.core/bootstrap.sh @@ -52,11 +52,11 @@ do_check() { echo fail:system not supported; return;; esac - proxy=no + proxy=not_found if test -d $proxydir; then bundle="org.eclipse.remote.proxy.server.core_$1.jar" if test -f $plugins/$bundle; then - proxy=yes + proxy=found else mv $proxydir $proxydir.pre_$1 fi diff --git a/bundles/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/ProxyConnectionBootstrap.java b/bundles/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/ProxyConnectionBootstrap.java index f6e786604c8..9262b93d5fc 100644 --- a/bundles/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/ProxyConnectionBootstrap.java +++ b/bundles/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/ProxyConnectionBootstrap.java @@ -141,7 +141,7 @@ public class ProxyConnectionBootstrap { String[] status = parts[1].split("/"); //$NON-NLS-1$ context.setOSName(status[1]); context.setOSArch(status[2]); - context.setState(status[0].equals("proxy") ? States.START : States.DOWNLOAD); //$NON-NLS-1$ + context.setState(status[0].equals("found") ? States.START : States.DOWNLOAD); //$NON-NLS-1$ return true; case "fail": //$NON-NLS-1$ context.setErrorMessage(parts[1]);