git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prevent exception when no default timeout is specified
[jalview.git]
/
src
/
jalview
/
bin
/
Cache.java
diff --git
a/src/jalview/bin/Cache.java
b/src/jalview/bin/Cache.java
index
aed61f2
..
0744cd9
100755
(executable)
--- a/
src/jalview/bin/Cache.java
+++ b/
src/jalview/bin/Cache.java
@@
-239,6
+239,11
@@
public class Cache
public void run()
{
String orgtimeout = System.getProperty("sun.net.client.defaultConnectTimeout");
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
{
String jnlpVersion = null;
try
{
@@
-263,6
+268,7
@@
public class Cache
}
catch (Exception ex)
{
}
catch (Exception ex)
{
+ System.out.println("Non-fatal exceptions when checking version at www.jalview.org :");
System.out.println(ex);
jnlpVersion = getProperty("VERSION");
}
System.out.println(ex);
jnlpVersion = getProperty("VERSION");
}