From d0b386f1c8c27a08c8b65bd23603f3d23f241670 Mon Sep 17 00:00:00 2001 From: jprocter Date: Wed, 3 Oct 2012 10:47:27 +0100 Subject: [PATCH] JAL-1026 - insert a sensible default for proxy so Jalview doesn't crash out immediatly on launch. --- src/jalview/bin/Cache.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java index b24304a..141470a 100755 --- a/src/jalview/bin/Cache.java +++ b/src/jalview/bin/Cache.java @@ -277,11 +277,14 @@ public class Cache if (getDefault("USE_PROXY", false)) { + String proxyServer=getDefault("PROXY_SERVER", ""), proxyPort=getDefault("PROXY_PORT", "8080"); + System.out.println("Using proxyServer: " - + getDefault("PROXY_SERVER", null) + " proxyPort: " - + getDefault("PROXY_PORT", null)); - System.setProperty("http.proxyHost", getDefault("PROXY_SERVER", null)); - System.setProperty("http.proxyPort", getDefault("PROXY_PORT", null)); + + proxyServer + " proxyPort: " + + proxyPort ); + + System.setProperty("http.proxyHost", proxyServer); + System.setProperty("http.proxyPort", proxyPort); } // LOAD THE AUTHORS FROM THE authors.props file -- 1.7.10.2