--- /dev/null	2016-07-12 14:35:29.888302783 -0700
+++ new/src/jdk.jshell/share/classes/jdk/jshell/execution/JShellECLogger.java	2016-07-12 22:46:56.991992748 -0700
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2016, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package jdk.jshell.execution;
+
+import jdk.internal.jshell.debug.InternalDebugControl;
+import jdk.jshell.spi.ExecutionEnv;
+
+/**
+ * An implementation of {@code ECLogger} which logs to JShell's internal logging
+ * mechanism.
+ */
+class JShellECLogger implements ECLogger {
+
+    private final ExecutionEnv execEnv;
+
+    /**
+     * Create a instance.
+     *
+     * @param execEnv the context
+     */
+    JShellECLogger(ExecutionEnv execEnv) {
+        this.execEnv = execEnv;
+    }
+
+    @Override
+    public void debug(String format, Object... args) {
+        InternalDebugControl.debug(execEnv.state(), execEnv.userErr(), InternalDebugControl.DBG_EC, format, args);
+    }
+
+    @Override
+    public void debug(Throwable ex, String where) {
+        InternalDebugControl.debug(execEnv.state(), execEnv.userErr(), ex, where);
+    }
+
+}