Mercurial > hg > release > icedtea6-1.11

changeset 2605:9dbcfded2579

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Denis Lila <dlila@redhat.com>
date Thu, 16 Jun 2011 12:57:43 -0400
parents 2eef438960e4 (current diff) fe70aef2215d (diff)
children 1d4ca38b3440
files ChangeLog Makefile.am
diffstat 3 files changed, 41 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jun 16 11:11:35 2011 -0400
+++ b/ChangeLog	Thu Jun 16 12:57:43 2011 -0400
@@ -76,6 +76,18 @@
 	(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1get_1state):
 	Change return type to jlong.
 
+2011-06-16  Pavel Tisnovsky  <ptisnovs@redhat.com>
+
+	* Makefile.am: fixed indentation (spaces2tabs)
+
+2011-06-16  Pavel Tisnovsky  <ptisnovs@redhat.com>
+
+	* Makefile.am: added new patch
+	* patches/jtreg-FileMap.patch:
+	Make sure that the regression test
+	openjdk/jdk/test/sun/net/www/protocol/file/FileMap.java
+	deletes all its work files.
+
 2011-06-15  Danesh Dadachanji  <ddadacha@redhat.com>
 
 	* AUTHORS: Added myself.
--- a/Makefile.am	Thu Jun 16 11:11:35 2011 -0400
+++ b/Makefile.am	Thu Jun 16 12:57:43 2011 -0400
@@ -218,9 +218,9 @@
 	patches/openjdk/6748082-isDisplayLocal.patch \
 	patches/openjdk/6633275-shaped_translucent_windows.patch \
 	patches/openjdk/6769607-modal-hangs.patch \
-        patches/openjdk/6791612-opengl-jni-fix.patch \
-        patches/openjdk/6755274-glgetstring-crash.patch \
-        patches/openjdk/6984543-onscreen_rendering_resize_test.patch \
+	patches/openjdk/6791612-opengl-jni-fix.patch \
+	patches/openjdk/6755274-glgetstring-crash.patch \
+	patches/openjdk/6984543-onscreen_rendering_resize_test.patch \
 	patches/openjdk/6693253-security_warning.patch \
 	patches/openjdk/6444769-windowwithwarningtest.patch \
 	patches/notice-safepoints.patch \
@@ -356,7 +356,8 @@
 	patches/jtreg-ChangeDir.patch \
 	patches/jtreg-TempBuffer.patch \
 	patches/jtreg-EncodedMultiByteChar.patch \
-	patches/jtreg-FileLoaderTest.patch
+	patches/jtreg-FileLoaderTest.patch \
+	patches/jtreg-FileMap.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-FileMap.patch	Thu Jun 16 12:57:43 2011 -0400
@@ -0,0 +1,24 @@
+--- openjdk.orig/jdk/test/sun/net/www/protocol/file/FileMap.java	2011-02-28 17:07:06.000000000 +0100
++++ openjdk/jdk/test/sun/net/www/protocol/file/FileMap.java	2011-06-16 11:30:19.000000000 +0200
+@@ -32,8 +32,9 @@
+ 
+ public class FileMap {
+     public static void main(String[] args) {
++        File f = null;
+         try {
+-            File f = File.createTempFile("test", null);
++            f = File.createTempFile("test", null);
+             f.deleteOnExit();
+             String s = f.getAbsolutePath();
+             s = s.startsWith("/") ? s : "/" + s;
+@@ -48,5 +49,10 @@
+         } catch (Exception ex) {
+             throw new RuntimeException("Unexpected exception: " + ex);
+         }
++        finally {
++            if ( f != null ) {
++                f.delete();
++            }
++        }
+     }
+ }