1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8194230: jdk/internal/jrtfs/remote/RemoteRuntimeImageTest.java fails with java.lang.NullPointerException

Browse Source 
Reviewed-by: mchung
This commit is contained in:
Felix Yang 2018-08-14 10:42:00 +08:00
parent 4bcd4f04a2
commit b5f939c5db
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/jdk/jdk/internal/jrtfs/remote/RemoteRuntimeImageTest.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -32,7 +32,6 @@ import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.nio.file.FileSystems;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
@ -55,7 +54,7 @@ public class RemoteRuntimeImageTest {
return; return;
} }
Path jdk8Path = getJdk8Path(jdk8Home); Path jdk8Path = Paths.get(jdk8Home);
if (!isJdk8(jdk8Path)) { if (!isJdk8(jdk8Path)) {
System.err.println("This test is only for JDK 8. Skip testing"); System.err.println("This test is only for JDK 8. Skip testing");
return; return;
@ -102,16 +101,14 @@ public class RemoteRuntimeImageTest {
} }
} }
private static Path getJdk8Path(String jdk8Home) { private static boolean isJdk8(Path jdk8HomePath) throws IOException {
Path jdk8Path = Paths.get(jdk8Home); File releaseFile = jdk8HomePath.resolve("release").toFile();
// It is possible to point to the path of java executable by ${JT_JAVA} if (!releaseFile.exists()) {
return Files.isDirectory(jdk8Path)? jdk8Path : jdk8Path.getParent().getParent(); throw new RuntimeException(releaseFile.getPath() +
" doesn't exist");
} }
private static boolean isJdk8(Path jdk8Home) throws FileNotFoundException, IOException {
File file = jdk8Home.resolve("release").toFile();
Properties props = new Properties(); Properties props = new Properties();
try (FileInputStream in = new FileInputStream(file)) { try (FileInputStream in = new FileInputStream(releaseFile)) {
props.load(in); props.load(in);
} }