From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 16 Sep 2015 14:05:44 +0000 (+0100)
Subject: JAL-1882 variable renamed to avoid confusion with member variable
X-Git-Tag: Release_2_10_0~400^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6c418f454a8e2044dff4bd1ac66ab37d46e7c312;p=jalview.git

JAL-1882 variable renamed to avoid confusion with member variable
---

diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index ee46581..4ea90e8 100755
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -417,7 +417,7 @@ public class Cache
             System.out.println("# INFO: Setting default net timeout to "
                     + orgtimeout + " seconds.");
           }
-          String jnlpVersion = null;
+          String remoteVersion = null;
           try
           {
             System.setProperty("sun.net.client.defaultConnectTimeout",
@@ -437,20 +437,20 @@ public class Cache
 
               line = line.substring(line.indexOf("value=") + 7);
               line = line.substring(0, line.lastIndexOf("\""));
-              jnlpVersion = line;
+              remoteVersion = line;
               break;
             }
           } catch (Exception ex)
           {
             System.out
-                    .println("Non-fatal exceptions when checking version at www.jalview.org :");
+                    .println("Non-fatal exception when checking version at www.jalview.org :");
             System.out.println(ex);
-            jnlpVersion = getProperty("VERSION");
+            remoteVersion = getProperty("VERSION");
           }
           System.setProperty("sun.net.client.defaultConnectTimeout",
                   orgtimeout);
 
-          setProperty("LATEST_VERSION", jnlpVersion);
+          setProperty("LATEST_VERSION", remoteVersion);
         }
       }