Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
541f8de2
Commit
541f8de2
authored
Jul 24, 2015
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
close socket properly
parent
7c31f5e5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
3 deletions
+9
-3
src/main/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala
...n/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala
+9
-3
No files found.
src/main/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala
View file @
541f8de2
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment