1 files changed, 0 insertions, 58 deletions
diff --git a/java/openjdk6/files/icedtea/openjdk/8011990-logger_test_urls.patch b/java/openjdk6/files/icedtea/openjdk/8011990-logger_test_urls.patch
deleted file mode 100644
index fa7fa70f6942..000000000000
--- a/java/openjdk6/files/icedtea/openjdk/8011990-logger_test_urls.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-# HG changeset patch
-# User jgish
-# Date 1366144454 14400
-#      Tue Apr 16 16:34:14 2013 -0400
-# Node ID a7048970934a1425d5486e6acd0b07558be038c4
-# Parent  ed410e3d08fe7792e6c08e411580564d2562c03e
-8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows
-Summary: Fix URL to reliably work on all platforms
-Reviewed-by: duke
-
-diff -r ed410e3d08fe -r a7048970934a test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java
---- jdk/test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java	Fri Apr 19 16:50:10 2013 -0700
-+++ jdk/test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java	Tue Apr 16 16:34:14 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]);
- 
-diff -r ed410e3d08fe -r a7048970934a test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java
---- jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java	Fri Apr 19 16:50:10 2013 -0700
-+++ jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java	Tue Apr 16 16:34:14 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?