changeset 49154:5447851ff0f6

8169358: httpserver does not close connections when RejectedExecutionException occurs Summary: Catch unexpected exceptions in Dispatcher::handle Reviewed-by: chegar, dfuchs, clanger Contributed-by: KUBOTA Yuji <kubota.yuji@gmail.com>
author ykubota
date Thu, 08 Mar 2018 11:21:57 +0900
parents e38b6a7f65ee
children 28729cf7e4bc
files src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java test/jdk/com/sun/net/httpserver/TaskRejectedTest.java
diffstat 2 files changed, 111 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java	Thu Mar 08 10:28:46 2018 -0500
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java	Thu Mar 08 11:21:57 2018 +0900
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -395,7 +395,6 @@
                         } else {
                             try {
                                 if (key.isReadable()) {
-                                    boolean closed;
                                     SocketChannel chan = (SocketChannel)key.channel();
                                     HttpConnection conn = (HttpConnection)key.attachment();
 
@@ -437,7 +436,6 @@
         }
 
         public void handle (SocketChannel chan, HttpConnection conn)
-        throws IOException
         {
             try {
                 Exchange t = new Exchange (chan, protocol, conn);
@@ -448,6 +446,9 @@
             } catch (IOException e) {
                 logger.log (Level.TRACE, "Dispatcher (5)", e);
                 closeConnection(conn);
+            } catch (Throwable e) {
+                logger.log (Level.TRACE, "Dispatcher (6)", e);
+                closeConnection(conn);
             }
         }
     }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/com/sun/net/httpserver/TaskRejectedTest.java	Thu Mar 08 11:21:57 2018 +0900
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8169358
+ * @summary  HttpServer does not close client connection when RejectedExecutionException occurs.
+ */
+
+import com.sun.net.httpserver.HttpServer;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.MalformedURLException;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.net.URL;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
+public class TaskRejectedTest {
+
+    private static final int BACKLOG = 0;
+
+    private static final String REQUEST_PATH = "/";
+
+    private static final int TIMEOUT = 10000; // 10 sec
+
+    private static void runClient(InetSocketAddress listenAddr)
+                                     throws MalformedURLException, IOException {
+        URL url = new URL("http", listenAddr.getHostString(),
+                                            listenAddr.getPort(), REQUEST_PATH);
+        HttpURLConnection con = (HttpURLConnection)url.openConnection();
+        con.setConnectTimeout(TIMEOUT);
+        con.setReadTimeout(TIMEOUT);
+
+        try {
+            con.connect();
+            con.getResponseCode();
+        } catch (SocketTimeoutException e) {
+            throw new RuntimeException("Connection was not closed by peer.", e);
+        } catch (SocketException e) {
+            // Expected (connection reset)
+        } finally {
+            con.disconnect();
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        Logger logger = Logger.getLogger(
+                            HttpServer.class.getPackage().getName());
+        Handler consoleHandler = new ConsoleHandler();
+        consoleHandler.setLevel(Level.FINEST);
+        logger.setLevel(Level.FINEST);
+        logger.addHandler(consoleHandler);
+
+        Executor executor = Executors.newSingleThreadExecutor(r -> {
+            throw new RejectedExecutionException("test");
+        });
+
+        InetSocketAddress addr = new InetSocketAddress(
+                                         InetAddress.getLoopbackAddress(), 0);
+        HttpServer httpServer = HttpServer.create(addr, BACKLOG);
+        httpServer.setExecutor(executor);
+
+        httpServer.createContext(REQUEST_PATH, exc -> {
+            exc.sendResponseHeaders(200, 0);
+            exc.close();
+        });
+
+        try {
+            httpServer.start();
+            runClient(httpServer.getAddress());
+        } finally {
+            httpServer.stop(0);
+        }
+    }
+}
+