aboutsummaryrefslogtreecommitdiffstats
path: root/java/com/tigervnc/network/TcpSocket.java
diff options
context:
space:
mode:
authorBrian Hinz <bphinz@users.sourceforge.net>2012-08-26 20:52:15 +0000
committerBrian Hinz <bphinz@users.sourceforge.net>2012-08-26 20:52:15 +0000
commit932fac573ab2f5a92c930e08de8aa9ddb98d4395 (patch)
treeb74ab123c4625241066c5ac8250d3c2e6015296d /java/com/tigervnc/network/TcpSocket.java
parent7e4488dce2eaf6b2d661aae890213500af9a5ba6 (diff)
downloadtigervnc-932fac573ab2f5a92c930e08de8aa9ddb98d4395.tar.gz
tigervnc-932fac573ab2f5a92c930e08de8aa9ddb98d4395.zip
Fix AccessControlException caused by using System.exit() in applet mode, and close viewer properly in several other cases.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4965 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'java/com/tigervnc/network/TcpSocket.java')
-rw-r--r--java/com/tigervnc/network/TcpSocket.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/com/tigervnc/network/TcpSocket.java b/java/com/tigervnc/network/TcpSocket.java
index ac53aaf7..cdc05016 100644
--- a/java/com/tigervnc/network/TcpSocket.java
+++ b/java/com/tigervnc/network/TcpSocket.java
@@ -153,9 +153,9 @@ public class TcpSocket extends Socket {
}
public void shutdown() throws Exception {
+ super.shutdown();
try {
- close();
- super.shutdown();
+ ((SocketDescriptor)getFd()).shutdown();
} catch (IOException e) {
throw new Exception(e.toString());
}