From 356e978bce5ab8303b52321a5348a0915f72c522 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Fri, 11 Jun 2010 14:47:22 +0100
Subject: [PATCH] 6938230: (so) SocketAdaptor.close() does not translate
 IOException resulting in Error

Reviewed-by: chegar
---
 jdk/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java | 6 +-----
 jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java       | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/jdk/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java b/jdk/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java
index c1b3f3bf373..eff83e2bff7 100644
--- a/jdk/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java
+++ b/jdk/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java
@@ -144,11 +144,7 @@ public class ServerSocketAdaptor                        // package-private
     }
 
     public void close() throws IOException {
-        try {
-            ssc.close();
-        } catch (Exception x) {
-            Net.translateException(x);
-        }
+        ssc.close();
     }
 
     public ServerSocketChannel getChannel() {
diff --git a/jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java b/jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java
index 36c8d9f2058..583835727e8 100644
--- a/jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java
+++ b/jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java
@@ -404,11 +404,7 @@ public class SocketAdaptor
     }
 
     public void close() throws IOException {
-        try {
-            sc.close();
-        } catch (Exception x) {
-            Net.translateToSocketException(x);
-        }
+        sc.close();
     }
 
     public void shutdownInput() throws IOException {