diff options
author | Arne Schwabe <arne@rfc2549.org> | 2015-11-02 16:03:34 +0100 |
---|---|---|
committer | Arne Schwabe <arne@rfc2549.org> | 2015-11-02 16:03:34 +0100 |
commit | 2e6a575fb8232fbb652d9f3dadefe90e628a51ca (patch) | |
tree | a9b3f26bdad3af0f3328361024edadaefbde3fb6 /main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java | |
parent | 4d6a12b09a2f0524820fb8f0a82eab625e401062 (diff) |
Fix minor bugs, fix lz4, new version, new translationsv0.6.44-productionv0.6.44
Diffstat (limited to 'main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java')
-rw-r--r-- | main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java b/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java index 6ba80e66..652616af 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java +++ b/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java @@ -148,7 +148,7 @@ public class ConfigParser { } - public class ConfigParseError extends Exception { + public static class ConfigParseError extends Exception { private static final long serialVersionUID = -60L; public ConfigParseError(String msg) { @@ -721,9 +721,15 @@ public class ConfigParser { } Vector<String> connectTimeout = getOption("connect-timeout", 1, 1); - if (connectTimeout != null) - conn.mConnectTimeout = Integer.parseInt(connectTimeout.get(0)); + if (connectTimeout != null) { + try { + conn.mConnectTimeout = Integer.parseInt(connectTimeout.get(1)); + } catch (NumberFormatException nfe) { + throw new ConfigParseError(String.format("Argument to connect-timeout (%s) must to be an integer: %s", + connectTimeout.get(1), nfe.getLocalizedMessage())); + } + } // Parse remote config Vector<Vector<String>> remotes = getAllOption("remote", 1, 3); |