Commit 541f8de2 authored by Max Lv's avatar Max Lv

close socket properly

parent 7c31f5e5
...@@ -89,7 +89,7 @@ class ShadowsocksVpnThread(vpnService: ShadowsocksVpnService) extends Thread { ...@@ -89,7 +89,7 @@ class ShadowsocksVpnThread(vpnService: ShadowsocksVpnService) extends Thread {
val socket = serverSocket.accept() val socket = serverSocket.accept()
pool.execute(new Runnable { pool.execute(new Runnable {
override def run(){ override def run() {
try { try {
val input = socket.getInputStream val input = socket.getInputStream
val output = socket.getOutputStream val output = socket.getOutputStream
...@@ -114,12 +114,18 @@ class ShadowsocksVpnThread(vpnService: ShadowsocksVpnService) extends Thread { ...@@ -114,12 +114,18 @@ class ShadowsocksVpnThread(vpnService: ShadowsocksVpnService) extends Thread {
input.close() input.close()
output.close() output.close()
} }
socket.close()
} catch { } catch {
case e: Exception => case e: Exception =>
Log.e(TAG, "Error when protect socket", e) Log.e(TAG, "Error when protect socket", e)
} }
// close socket
try {
socket.close()
} catch {
case _: Exception => // ignore
}
}}) }})
} catch { } catch {
case e: IOException => Log.e(TAG, "Error when accept socket", e) case e: IOException => Log.e(TAG, "Error when accept socket", e)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment