OpenJDK / bsd-port / bsd-port / jdk
changeset 5992:e6b6c254fab2
Merge
| author | mullan |
|---|---|
| date | Thu, 18 Apr 2013 17:57:54 -0400 |
| parents | f6dce3552285 5fc00e7f7f5b |
| children | f8373784a79e |
| files | |
| diffstat | 3 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Apr 18 17:53:27 2013 -0400 +++ b/.hgtags Thu Apr 18 17:57:54 2013 -0400 @@ -270,3 +270,4 @@ 7fc6c331082c3586fa6c6ead014c96f3c532bc34 jdk7u25-b04 f2d4da9ba0f05165e8a85d0fd5085d707e434eab jdk7u25-b05 5748526c96f0d3fd5771b72a81fcd61f4e23b0d8 jdk7u25-b06 +fe514475bc17355f5f0a8dc7dd423d0043ed5326 jdk7u25-b07
--- a/test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java Thu Apr 18 17:53:27 2013 -0400 +++ b/test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java Thu Apr 18 17:57:54 2013 -0400 @@ -21,6 +21,7 @@ * questions. */ +import java.io.File; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.URL; @@ -45,11 +46,13 @@ String testClassesDir = System.getProperty("test.classes", System.getProperty("user.dir")); String sep = System.getProperty("file.separator"); + URL[] urls = new URL[2]; // Allow for both jtreg and standalone cases here - urls[0] = new URL("file://" + testDir + sep + "resources" + sep); - urls[1] = new URL("file://" + testClassesDir + sep ); + urls[0] = new File( testDir + sep + "resources" + sep ).toURI().toURL(); + urls[1] = new File( testClassesDir + sep ).toURI().toURL(); + System.out.println("INFO: urls[0] = " + urls[0]); System.out.println("INFO: urls[1] = " + urls[1]);
--- a/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java Thu Apr 18 17:53:27 2013 -0400 +++ b/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java Thu Apr 18 17:57:54 2013 -0400 @@ -29,6 +29,7 @@ * @build ResourceBundleSearchTest IndirectlyLoadABundle LoadItUp * @run main ResourceBundleSearchTest */ +import java.io.File; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; @@ -70,7 +71,8 @@ String sep = System.getProperty("file.separator"); URL[] urls = new URL[1]; - urls[0] = new URL("file://" + testDir + sep + "resources" + sep); + + urls[0] = new File( testDir + sep + "resources" + sep ).toURI().toURL(); URLClassLoader rbClassLoader = new URLClassLoader(urls); // Test 1 - can we find a Logger bundle from doing a stack search?