--- a/src/java.net.http/share/classes/jdk/internal/net/http/common/DebugLogger.java	Fri Apr 13 15:43:16 2018 +0100
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/DebugLogger.java	Fri Apr 13 16:14:15 2018 +0100
@@ -29,7 +29,6 @@
 import java.util.Objects;
 import java.util.ResourceBundle;
 import java.util.function.Supplier;
-import java.lang.System.Logger;
 
 /**
  * A {@code System.Logger} that forwards all messages to an underlying
@@ -50,15 +49,15 @@
     final static String HTTP_NAME  = "jdk.internal.httpclient.debug";
     final static String WS_NAME  = "jdk.internal.httpclient.websocket.debug";
     final static String HPACK_NAME = "jdk.internal.httpclient.hpack.debug";
-    final static Logger HTTP = System.getLogger(HTTP_NAME);
-    final static Logger WS = System.getLogger(WS_NAME);
-    final static Logger HPACK = System.getLogger(HPACK_NAME);
+    final static System.Logger HTTP = System.getLogger(HTTP_NAME);
+    final static System.Logger WS = System.getLogger(WS_NAME);
+    final static System.Logger HPACK = System.getLogger(HPACK_NAME);
     final static long START_NANOS = System.nanoTime();
 
     private final Supplier<String> dbgTag;
     private final Level errLevel;
     private final Level outLevel;
-    private final Logger logger;
+    private final System.Logger logger;
     private final boolean debugOn;
     private final boolean traceOn;
 
@@ -94,7 +93,7 @@
      *
      * @return A logger for HTTP internal debug traces
      */
-    private DebugLogger(Logger logger,
+    private DebugLogger(System.Logger logger,
                 Supplier<String> dbgTag,
                 Level outLevel,
                 Level errLevel) {
@@ -121,6 +120,11 @@
     }
 
     @Override
+    public boolean isOn() {
+        return debugOn;
+    }
+
+    @Override
     public boolean isLoggable(Level level) {
         // fast path, we assume these guys never change.
         // support only static configuration.