infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-10 21:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

8132857: Historical name of default encoding shown on encoding mismatch

Browse Source 
Using Charset.defaultCharset().name() to get the proper name of the default Charset.

Reviewed-by: jjg
This commit is contained in:
Jan Lahoda 2016-06-28 15:46:52 +02:00
parent b69fa0a44d
commit 11272cf548
2 changed files with 79 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java
View File

@ -25,10 +25,8 @@
package com.sun.tools.javac.file;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStreamWriter;
import java.lang.ref.SoftReference;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
@ -43,7 +41,6 @@ import java.nio.charset.CodingErrorAction;
import java.nio.charset.IllegalCharsetNameException;
import java.nio.charset.UnsupportedCharsetException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
@ -65,7 +62,6 @@ import com.sun.tools.javac.util.Abort;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.DefinedBy;
import com.sun.tools.javac.util.DefinedBy.Api;
import com.sun.tools.javac.util.JCDiagnostic.SimpleDiagnosticPosition;
import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.util.Options;
@ -334,8 +330,7 @@ public abstract class BaseFileManager implements JavaFileManager {
private String defaultEncodingName;
private String getDefaultEncodingName() {
if (defaultEncodingName == null) {
defaultEncodingName =
new OutputStreamWriter(new ByteArrayOutputStream()).getEncoding();
defaultEncodingName = Charset.defaultCharset().name();
}
return defaultEncodingName;
}

78
langtools/test/tools/javac/file/T8132857.java Normal file
View File

@ -0,0 +1,78 @@
/*
* 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.
*
* 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 8132857
* @summary Verify an up-to-date name for UTF-8 encoding is provided in error messages.
* @modules jdk.compiler
*/
import java.io.*;
import java.nio.charset.Charset;
public class T8132857 {
public static void main(String... args) throws Exception{
new T8132857().run();
}
void run() throws IOException {
if (!Charset.defaultCharset().equals(Charset.forName("UTF-8"))) {
System.err.println("skipping test, default charset is not UTF-8");
return;
}
File src = new File("src");
src.mkdirs();
try (OutputStream out = new FileOutputStream(new File(src, "Test.java"))) {
out.write('/');
out.write('/');
out.write(0b1100_0000);
out.write('a');
}
try (StringWriter out = new StringWriter(); PrintWriter pw = new PrintWriter(out)) {
int rc = com.sun.tools.javac.Main.compile(new String[] {"-XDrawDiagnostics", "src/Test.java"}, pw);
pw.flush();
String lineSeparator = System.getProperty("line.separator");
String expected =
"Test.java:1:3: compiler.err.illegal.char.for.encoding: C0, UTF-8" + lineSeparator +
"1 error" + lineSeparator;
String actual = out.toString();
System.err.println(actual);
if (rc == 0) {
throw new Error("compilation unexpectedly passed: " + rc);
}
if (!expected.equals(actual)) {
throw new Error("unexpected output: " + actual);
}
}
}
}