Fixes #1928 - Backport #1705 to jetty-9.3.x.

jetty · Oct 30, 2017 · 6f8baff · 6f8baff
1 parent 090ce91
commit 6f8baff
Showing 1 changed file with 28 additions and 12 deletions.
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java
@@ -431,18 +431,7 @@ private EndPoint createEndPoint(SocketChannel channel, SelectionKey selectionKey
     public void destroyEndPoint(final EndPoint endPoint)
     {
         final Connection connection = endPoint.getConnection();
-        submit(new Product()
-        {
-            @Override
-            public void run()
-            {
-                if (LOG.isDebugEnabled())
-                    LOG.debug("Destroyed {}", endPoint);
-                if (connection != null)
-                    _selectorManager.connectionClosed(connection);
-                _selectorManager.endPointClosed(endPoint);
-            }
-        });
+        submit(new DestroyEndPoint(endPoint));
     }
 
     @Override
@@ -776,4 +765,31 @@ public boolean await(long timeout)
             }
         }
     }
+
+    private class DestroyEndPoint implements Product, Closeable
+    {
+        private final EndPoint _endPoint;
+
+        private DestroyEndPoint(EndPoint endPoint)
+        {
+            _endPoint = endPoint;
+        }
+
+        @Override
+        public void run()
+        {
+            if (LOG.isDebugEnabled())
+                LOG.debug("Destroyed {}", _endPoint);
+            Connection connection = _endPoint.getConnection();
+            if (connection != null)
+                _selectorManager.connectionClosed(connection);
+            _selectorManager.endPointClosed(_endPoint);
+        }
+
+        @Override
+        public void close() throws IOException
+        {
+            run();
+        }
+    }
 }