jetty-9 EndPoint.close does not throw

7 files changed, 19 insertions, 27 deletions

diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractAsyncConnection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractAsyncConnection.java
index 54f3338a43..14fc0c810e 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractAsyncConnection.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractAsyncConnection.java
@@ -42,15 +42,7 @@ public abstract class AbstractAsyncConnection
         catch(IOException e)
         {
             LOG.ignore(e);
-
-            try
-            {
-                _endp.close();
-            }
-            catch(IOException e2)
-            {
-                LOG.ignore(e2);
-            }
+            _endp.close();
         }
     }
         
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java
index 758ac3da3d..804de0baf8 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java
@@ -220,7 +220,7 @@ public class ByteArrayEndPoint extends AbstractEndPoint
      * @see org.eclipse.io.EndPoint#close()
      */
     @Override
-    public void close() throws IOException
+    public void close()
     {
         _closed=true;
     }
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
index 505cf9ae38..2703342aef 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
@@ -121,10 +121,18 @@ public class ChannelEndPoint extends AbstractEndPoint
      * @see org.eclipse.io.EndPoint#close()
      */
     @Override
-    public void close() throws IOException
+    public void close()
     {
-        LOG.debug("close {}",this);
-        _channel.close();
+        try
+        {
+            LOG.debug("close {}",this);
+            _channel.close();
+        }
+        catch(IOException e)
+        {
+            LOG.warn(e.toString());
+            LOG.debug(e);
+        }
     }
 
     /* (non-Javadoc)
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java
index ea9cd25f70..fba6aa3263 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java
@@ -79,7 +79,7 @@ public interface EndPoint
     /**
      * Close any backing stream associated with the endpoint
      */
-    void close() throws IOException;
+    void close();
 
     /**
      * Fill the passed buffer with data from this endpoint.  The bytes are appended to any 
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java
index 335134f9ad..35b3177123 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java
@@ -438,7 +438,7 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
      * @see org.eclipse.io.nio.ChannelEndPoint#close()
      */
     @Override
-    public void close() throws IOException
+    public void close()
     {
         _lock.lock();
         try
@@ -447,11 +447,10 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
             {
                 super.close();
             }
-            catch (IOException e)
+            finally
             {
-                LOG.ignore(e);
+                updateKey();
             }
-            updateKey();
         }
         finally
         {
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
index 2d6e42feaa..9733878915 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
@@ -880,14 +880,7 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
                     if (att instanceof EndPoint)
                     {
                         EndPoint endpoint = (EndPoint)att;
-                        try
-                        {
-                            endpoint.close();
-                        }
-                        catch(IOException e)
-                        {
-                            LOG.ignore(e);
-                        }
+                        endpoint.close();
                     }
                 }
 
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SslConnection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SslConnection.java
index 057effd506..e691ba1a2d 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/SslConnection.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SslConnection.java
@@ -613,7 +613,7 @@ public class SslConnection extends AbstractAsyncConnection
         }
 
         @Override
-        public void close() throws IOException
+        public void close()
         {
             LOG.debug("{} ssl endp.close",_session);
             _endp.close();