--- a/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java	Wed Feb 28 15:48:46 2018 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java	Wed Feb 28 19:13:16 2018 +0000
@@ -291,13 +291,13 @@
             if (t.getCause() != null) retryCause = t.getCause();
             if (!expiredOnce) {
                 DEBUG_LOGGER.log(Level.DEBUG,
-                    "MultiExchange: ConnectionExpiredException (async): retrying...",
+                    "ConnectionExpiredException (async): retrying...",
                     t);
                 expiredOnce = true;
                 return null;
             } else {
                 DEBUG_LOGGER.log(Level.DEBUG,
-                    "MultiExchange: ConnectionExpiredException (async): already retried once.",
+                    "ConnectionExpiredException (async): already retried once.",
                     t);
                 if (t.getCause() != null) t = t.getCause();
             }

--- a/test/jdk/java/net/httpclient/http2/server/Http2TestServer.java	Wed Feb 28 15:48:46 2018 +0000
+++ b/test/jdk/java/net/httpclient/http2/server/Http2TestServer.java	Wed Feb 28 19:13:16 2018 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -245,6 +245,11 @@
                         //throw e;
                     }
                 }
+            } catch (SecurityException se) {
+                System.err.println("TestServer: terminating, caught " + se);
+                se.printStackTrace();
+                stopping = true;
+                try { server.close(); } catch (IOException ioe) { /* ignore */}
             } catch (Throwable e) {
                 if (!stopping) {
                     System.err.println("TestServer: terminating, caught " + e);