diff options
author | Parménides GV <parmegv@sdf.org> | 2014-12-23 20:09:25 +0100 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-12-23 20:09:25 +0100 |
commit | 44b59b984f76da62d409b585047224cb1e958016 (patch) | |
tree | 1a8d7f85690ce56196855fa969e86b1e53d813f3 /app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java | |
parent | b3f0c7b3111efc1066423925b02a9edf9e15eaa7 (diff) | |
parent | d6190becb1c48ee912b11a4206116d0fd4c90772 (diff) |
Merge branch 'bug/Try-different-ports-to-connect-to-the-openvpn-server-#6560' into develop
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java')
-rw-r--r-- | app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java index 37094a1b..1c3b3362 100644 --- a/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java +++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; @@ -157,7 +157,7 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement { } } catch (IOException e) { - if (!e.getMessage().equals("socket closed")) + if (!e.getMessage().equals("socket closed") && !e.getMessage().equals("Connection reset by peer")) VpnStatus.logException(e); } synchronized (active) { |