/hg/icedtea6: Added patch for a regression test

[ptisnovs at icedtea.classpath.org]

changeset f2acaead4723 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f2acaead4723
author: ptisnovs
date: Wed Jun 15 16:38:01 2011 +0200

	Added patch for a regression test
	openjdk/jdk/test/sun/misc/URLClassPath/FileLoaderTest.java


diffstat:

 ChangeLog                          |  10 +++++++++-
 Makefile.am                        |   3 ++-
 patches/jtreg-FileLoaderTest.patch |  35 +++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 2 deletions(-)

diffs (77 lines):

diff -r 78a0ce4fd551 -r f2acaead4723 ChangeLog
--- a/ChangeLog	Tue Jun 14 17:25:06 2011 +0200
+++ b/ChangeLog	Wed Jun 15 16:38:01 2011 +0200
@@ -1,4 +1,4 @@
-2011-06-14  Pavel Tisnovsky  <ptisnovs at redhat.com>
+2011-06-15  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* Makefile.am: added new patch
 	* patches/jtreg-EncodedMultiByteChar.patch:
@@ -6,6 +6,14 @@
 	openjdk/jdk/test/sun/net/www/protocol/file/EncodedMultiByteChar.java
 	deletes all its work files.
 
+2011-06-14  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am: added new patch
+	* patches/jtreg-FileLoaderTest.patch:
+	Make sure that the regression test
+	openjdk/jdk/test/sun/misc/URLClassPath/FileLoaderTest.java
+	deletes all its work files.
+
 2011-06-14  Denis Lila  <dlila at redhat.com>
 
 	* Makefile.am: Add patch.
diff -r 78a0ce4fd551 -r f2acaead4723 Makefile.am
--- a/Makefile.am	Tue Jun 14 17:25:06 2011 +0200
+++ b/Makefile.am	Wed Jun 15 16:38:01 2011 +0200
@@ -355,7 +355,8 @@
 	patches/openjdk/7036148-npe-null-jmenu-name.patch \
 	patches/jtreg-ChangeDir.patch \
 	patches/jtreg-TempBuffer.patch \
-	patches/jtreg-EncodedMultiByteChar.patch
+	patches/jtreg-EncodedMultiByteChar.patch \
+	patches/jtreg-FileLoaderTest.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r 78a0ce4fd551 -r f2acaead4723 patches/jtreg-FileLoaderTest.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-FileLoaderTest.patch	Wed Jun 15 16:38:01 2011 +0200
@@ -0,0 +1,36 @@
+--- openjdk.orig/jdk/test/sun/misc/URLClassPath/FileLoaderTest.java	2011-02-28 17:07:05.000000000 +0100
++++ openjdk/jdk/test/sun/misc/URLClassPath/FileLoaderTest.java	2011-06-14 16:49:57.000000000 +0200
+@@ -31,16 +31,24 @@
+ 
+ public class FileLoaderTest {
+   public static void main (String args[]) throws Exception {
+-      File tempFile = File.createTempFile("foo", ".txt");
+-      tempFile.deleteOnExit();
+-      String basestr = tempFile.toURL().toString();
+-      basestr = basestr.substring(0, basestr.lastIndexOf("/")+1);
+-      URL url = new URL(basestr+"."+"/");
++      File tempFile = null;
++      try
++      {
++          tempFile = File.createTempFile("foo", ".txt");
++          String basestr = tempFile.toURL().toString();
++          basestr = basestr.substring(0, basestr.lastIndexOf("/")+1);
++          URL url = new URL(basestr+"."+"/");
+ 
+-      ClassLoader cl = new URLClassLoader (new URL[] { url });
+-      if (cl.getResource (tempFile.getName()) == null) {
+-          throw new RuntimeException("Returned null instead of " +
+-                                     tempFile.toURL().toString());
++          ClassLoader cl = new URLClassLoader (new URL[] { url });
++          if (cl.getResource (tempFile.getName()) == null) {
++              throw new RuntimeException("Returned null instead of " +
++                      tempFile.toURL().toString());
++          }
++      }
++      finally {
++          if (tempFile != null) {
++              tempFile.delete();
++          }
+       }
+    }
+ }