--- old/src/jdk.jshell/share/classes/jdk/jshell/Unit.java	2016-01-01 06:09:38.138021345 +0900
+++ new/src/jdk.jshell/share/classes/jdk/jshell/Unit.java	2016-01-01 06:09:37.986013926 +0900
@@ -34,6 +34,7 @@
 import java.util.Set;
 import java.util.stream.Stream;
 import com.sun.jdi.ReferenceType;
+import java.util.Locale;
 import jdk.jshell.Snippet.Kind;
 import jdk.jshell.Snippet.Status;
 import jdk.jshell.Snippet.SubKind;
@@ -456,7 +457,7 @@
             for (Diag diag : diags) {
                 if (diag.isError()) {
                     if (diag.isResolutionError()) {
-                        String m = diag.getMessage(null);
+                        String m = diag.getMessage(Locale.ROOT);
                         int symPos = m.indexOf(RESOLVE_ERROR_SYMBOL);
                         if (symPos >= 0) {
                             m = m.substring(symPos + RESOLVE_ERROR_SYMBOL.length());