changeset 2471:7079585d6e0e

6938230: (so) SocketAdaptor.close() does not translate IOException resulting in Error Reviewed-by: chegar
author alanb
date Fri, 11 Jun 2010 14:47:22 +0100
parents 06699a990ac7
children c849dc20dc85 0e3daaccfbdf
files src/share/classes/sun/nio/ch/ServerSocketAdaptor.java src/share/classes/sun/nio/ch/SocketAdaptor.java
diffstat 2 files changed, 2 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java	Fri Jun 11 14:31:26 2010 +0100
+++ b/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java	Fri Jun 11 14:47:22 2010 +0100
@@ -144,11 +144,7 @@
     }
 
     public void close() throws IOException {
-        try {
-            ssc.close();
-        } catch (Exception x) {
-            Net.translateException(x);
-        }
+        ssc.close();
     }
 
     public ServerSocketChannel getChannel() {
--- a/src/share/classes/sun/nio/ch/SocketAdaptor.java	Fri Jun 11 14:31:26 2010 +0100
+++ b/src/share/classes/sun/nio/ch/SocketAdaptor.java	Fri Jun 11 14:47:22 2010 +0100
@@ -404,11 +404,7 @@
     }
 
     public void close() throws IOException {
-        try {
-            sc.close();
-        } catch (Exception x) {
-            Net.translateToSocketException(x);
-        }
+        sc.close();
     }
 
     public void shutdownInput() throws IOException {