X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FCache.java;h=0744cd9e18b854c37a0f837e297a3794b83ab99c;hb=ab92d7c2f18178bc4ab6584c8dfe657a68e70693;hp=92bd7b6823e26459f267e5e3054b8e2e6f269ca8;hpb=e08759789bbd73699266d5015a3af3605997b637;p=jalview.git
diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index 92bd7b6..0744cd9 100755
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -53,6 +53,7 @@ import org.apache.log4j.*;
*
SHOW_QUALITY show alignment quality annotation
* SHOW_ANNOTATIONS show alignment annotation rows
* SHOW_CONSERVATION show alignment conservation annotation
+ * CENTRE_COLUMN_LABELS centre the labels at each column in a displayed annotation row
* DEFAULT_COLOUR default colour scheme to apply for a new alignment
* DEFAULT_FILE_FORMAT file format used to save
* STARTUP_FILE file loaded on startup (may be a fully qualified url)
@@ -237,9 +238,16 @@ public class Cache
{
public void run()
{
+ String orgtimeout = System.getProperty("sun.net.client.defaultConnectTimeout");
+ if (orgtimeout==null)
+ {
+ orgtimeout="30";
+ System.out.println("# INFO: Setting default net timeout to "+orgtimeout+" seconds.");
+ }
String jnlpVersion = null;
try
{
+ System.setProperty("sun.net.client.defaultConnectTimeout", "5000");
java.net.URL url = new java.net.URL(
"http://www.jalview.org/webstart/jalview.jnlp");
BufferedReader in = new BufferedReader(new InputStreamReader(url.
@@ -260,9 +268,11 @@ public class Cache
}
catch (Exception ex)
{
+ System.out.println("Non-fatal exceptions when checking version at www.jalview.org :");
System.out.println(ex);
jnlpVersion = getProperty("VERSION");
}
+ System.setProperty("sun.net.client.defaultConnectTimeout", orgtimeout);
setProperty("LATEST_VERSION", jnlpVersion);
}