stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8172414: jshell not working in exploded JDK build

Browse Source 
Using Class.getResourceAsStream instead of a direct reference to JRT.

Reviewed-by: rfield, sundar
This commit is contained in:
Jan Lahoda 2017-01-10 13:53:44 +01:00
parent fd12ea2d58
commit b8bdb56985
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
View File

@ -218,7 +218,7 @@ public class JShellTool implements MessageHandler {
static final String DEFAULT_STARTUP_NAME = "DEFAULT";
static final Pattern BUILTIN_FILE_PATTERN = Pattern.compile("\\w+");
static final String BUILTIN_FILE_PATH_FORMAT = "jrt:/jdk.jshell/jdk/jshell/tool/resources/%s.jsh";
static final String BUILTIN_FILE_PATH_FORMAT = "/jdk/jshell/tool/resources/%s.jsh";
// match anything followed by whitespace
private static final Pattern OPTION_PRE_PATTERN =
@ -2426,9 +2426,11 @@ public class JShellTool implements MessageHandler {
String readResource(String name) throws IOException {
// Attempt to find the file as a resource
String spec = String.format(BUILTIN_FILE_PATH_FORMAT, name);
URL url = new URL(spec);
BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream()));
return reader.lines().collect(Collectors.joining("\n"));
try (InputStream in = JShellTool.class.getResourceAsStream(spec);
BufferedReader reader = new BufferedReader(new InputStreamReader(in))) {
return reader.lines().collect(Collectors.joining("\n"));
}
}
// retrieve the default startup string