| commit | ac2830953d854b577503d7116a8d1a8338d8e527 | [log] [tgz] |
|---|---|---|
| author | Watson, Gregory <g.watson@computer.org> | Wed Jan 18 21:49:50 2017 -0500 |
| committer | Watson, Gregory <g.watson@computer.org> | Wed Jan 18 21:49:50 2017 -0500 |
| tree | 9f59160f4a3ad2ba08d1451f03559b202672f1e2 | |
| parent | fa3fe15caba90d79ab8f42c966a60a8baca9e972 [diff] |
Fix check for existing proxy. Change-Id: I3e6357f6f9671a2c411b873169d73041442285c3 Signed-off-by: Watson, Gregory <g.watson@computer.org>
diff --git a/bundles/org.eclipse.remote.proxy.core/bootstrap.sh b/bundles/org.eclipse.remote.proxy.core/bootstrap.sh index a02a233..c3be670 100644 --- a/bundles/org.eclipse.remote.proxy.core/bootstrap.sh +++ b/bundles/org.eclipse.remote.proxy.core/bootstrap.sh
@@ -52,11 +52,11 @@ 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 f6e7866..9262b93 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 @@ 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]);