Reviewer needed - fix for a regression test openjdk/jdk/test/sun/net/www/protocol/file/FileMap.java in IcedTea6 HEAD

[Jiri Vanek]

On 06/16/2011 11:48 AM, Pavel Tisnovsky wrote:
> Hi,
>
> I'd like to push fix for a regression test
> openjdk/jdk/test/sun/net/www/protocol/file/FileMap.java into IcedTea6
> HEAD. This fix is very simple and similar to other fixes I sent
> yesterday and two days ago - test should deletes all its temporary work
> files to not to harm any other regression tests.
>
> ChangeLog entry:
> 2011-06-16  Pavel Tisnovsky<ptisnovs at 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.
>
> Can anybody please review this fix?
>
> Thank you in advance,
> Pavel
>
>
> hg_diff.patch
>
>
> diff -r 830e2c11d9f3 Makefile.am
> --- a/Makefile.am	Wed Jun 15 15:29:46 2011 -0400
> +++ b/Makefile.am	Thu Jun 16 11:48:15 2011 +0200
> @@ -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 += \
> diff -r 830e2c11d9f3 patches/jtreg-FileMap.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/jtreg-FileMap.patch	Thu Jun 16 11:48:15 2011 +0200
> @@ -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();
> ++            }
> ++        }
> +     }
> + }

Yap - the same - go on.!

btw.. Maybe you should public the reason for all this clean up.


Regards J.