summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-11-28 22:31:43 +0100
committerArne Schwabe <arne@rfc2549.org>2014-11-28 22:31:43 +0100
commit9a5a1c81122cd63fc1652bd30b8447cd06453ddf (patch)
tree86b14986e15ef23b8bc95a2b7bdfcb778ec157a4 /main
parent510461c2f500480525171e63f77bb2c8c10b7a9f (diff)
On Android 5.0 closing the socket might also report "Connection reset by peer", ignore the exception in this case (closes issue #307)
--HG-- extra : rebase_source : 923785d8ddc82eeff7e077bde8e8bd55ae46f3cc
Diffstat (limited to 'main')
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
index ddc134b5..1692fecc 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
@@ -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) {