Skip to content

8357993: Use "stdin.encoding" for reading System.in with InputStreamReader/Scanner [hotspot] #25542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

8357993: Use "stdin.encoding" for reading System.in with InputStreamReader/Scanner [hotspot] #25542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a6d6cd2
Use `stdin.encoding` in `InputStreamReader` and `Scanner` instantiations
vy May 15, 2025
123a78f
Revert `PandocFilter` changes
vy May 28, 2025
2b9ae71
Revert changes to 3rd parties in `com/sun/org/apache`
vy May 28, 2025
58fbb80
Revert superfluous changes
vy May 28, 2025
80e5287
Discard changes unrelated with build and tools
vy May 28, 2025
d775129
Remove redundant assert
vy May 30, 2025
45bdc4f
Provide fallback for `stdin.encoding`
vy Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CLHSDB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2025, 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
Expand Down Expand Up @@ -28,6 +28,7 @@
import sun.jvm.hotspot.debugger.*;

import java.io.*;
import java.nio.charset.Charset;
import java.util.*;

public class CLHSDB {
Expand Down Expand Up @@ -106,8 +107,8 @@ public void reattach() {
};


BufferedReader in =
new BufferedReader(new InputStreamReader(System.in));
Charset charset = Charset.forName(System.getProperty("stdin.encoding"), Charset.defaultCharset());
BufferedReader in = new BufferedReader(new InputStreamReader(System.in, charset));
CommandProcessor cp = new CommandProcessor(di, in, System.out, System.err);
cp.run(true);

Expand Down
6 changes: 4 additions & 2 deletions src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/UserInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2025, 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
Expand Down Expand Up @@ -27,6 +27,7 @@
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.charset.Charset;

public final class UserInterface {

Expand All @@ -40,7 +41,8 @@ public void println(String text) {

public String readLine() throws AbortException {
try {
BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
Charset charset = Charset.forName(System.getProperty("stdin.encoding"), Charset.defaultCharset());
BufferedReader br = new BufferedReader(new InputStreamReader(System.in, charset));
String line = br.readLine();
if (line == null || line.equalsIgnoreCase("Q")) {
println();
Expand Down
5 changes: 3 additions & 2 deletions test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach010/attach010Agent00.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2025, 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
Expand Down Expand Up @@ -60,7 +60,8 @@ protected void agentActions() throws Throwable {
FileInputStream newInputStream = new FileInputStream(inStreamFileName);
System.setIn(newInputStream);

BufferedReader inputStreamReader = new BufferedReader(new InputStreamReader(System.in));
BufferedReader inputStreamReader = new BufferedReader(new InputStreamReader(
System.in, System.getProperty("stdin.encoding")));
int readValue = Integer.parseInt(inputStreamReader.readLine());

if (readValue != valueToWrite) {
Expand Down
4 changes: 2 additions & 2 deletions test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2025, 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
Expand Down Expand Up @@ -173,7 +173,7 @@ private int runIt(String argv[], PrintStream out) {
}

BufferedReader stdIn = new BufferedReader(
new InputStreamReader(System.in));
new InputStreamReader(System.in, System.getProperty("stdin.encoding")));
try (ListeningThread listeningThread = new ListeningThread(this)) {
listeningThread.bind();
listeningThread.start();
Expand Down