Reviewer needed - fix for regression test jdk/test/sun/nio/ch/TempBuffer.java in IcedTea6

[Jiri Vanek]

On 06/13/2011 04:44 PM, Pavel Tisnovsky wrote:
> Hi,
>
> here's fix for another regression test
> (jdk/test/sun/nio/ch/TempBuffer.java). This fix ensures that this test
> deletes all its work files. Checked on RHEL 5.6. Is it ok to push the
> fix to IcedTea6 HEAD please?
>
> 2011-06-13  Pavel Tisnovsky<ptisnovs at redhat.com>
>
>          * Makefile.am: added new patch
>          * patches/jtreg-TempBuffer.patch
>          Make sure that the regression test
>          jdk/test/sun/nio/ch/TempBuffer.java deletes
>          all its work files.
>
> Cheers,
> Pavel
>
>
> hg_diff.patch
>
>
> diff -r c51663f190c9 Makefile.am
> --- a/Makefile.am	Fri Jun 10 22:58:13 2011 +0100
> +++ b/Makefile.am	Mon Jun 13 15:34:01 2011 +0200
> @@ -351,7 +351,8 @@
>   	patches/openjdk/7037939-hugepage.patch \
>   	patches/openjdk/7043564-hugepage.patch \
>   	patches/openjdk/mutter.patch \
> -	patches/fonts-rhel-version.patch
> +	patches/fonts-rhel-version.patch \
> +	patches/jtreg-TempBuffer.patch
>
>   if WITH_ALT_HSBUILD
>   ICEDTEA_PATCHES += \
> diff -r c51663f190c9 patches/jtreg-TempBuffer.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/jtreg-TempBuffer.patch	Mon Jun 13 15:34:01 2011 +0200
> @@ -0,0 +1,61 @@
> +--- openjdk.orig/jdk/test/sun/nio/ch/TempBuffer_orig.java	2011-02-28 17:07:06.000000000 +0100
> ++++ openjdk/jdk/test/sun/nio/ch/TempBuffer.java	2011-06-13 15:10:29.000000000 +0200
> +@@ -48,18 +48,29 @@
> +
> +         Thread writerThread = new Thread() {
> +             public void run() {
> ++                File blah = null;
> +                 try {
> +                     OutputStream out = Channels.newOutputStream(sinkChannel);
> +-                    File blah = File.createTempFile("blah1", null);
> ++                    blah = File.createTempFile("blah1", null);
> +                     blah.deleteOnExit();
> +                     TempBuffer.initTestFile(blah);
> +                     RandomAccessFile raf = new RandomAccessFile(blah, "rw");
> +                     FileChannel fs = raf.getChannel();
> +-                    fs.transferTo(0, SIZE, Channels.newChannel(out));
> ++                    try {
> ++                        fs.transferTo(0, SIZE, Channels.newChannel(out));
> ++                    } finally {
> ++                        fs.close();
> ++                        raf.close();
> ++                    }
> +                     out.flush();
> +                 } catch (IOException ioe) {
> +                     throw new RuntimeException(ioe);
> +                 }
> ++                finally {
> ++                    if (blah != null) {
> ++                        blah.delete();
> ++                    }
> ++                }
> +             }
> +         };
> +
> +@@ -70,9 +81,16 @@
> +         blah.deleteOnExit();
^^^ this seams useless as it is deleted below
> +         RandomAccessFile raf = new RandomAccessFile(blah, "rw");
> +         FileChannel fs = raf.getChannel();
> +-        raf.setLength(SIZE);
> +-        fs.transferFrom(Channels.newChannel(in), 0, SIZE);
> +-        fs.close();
> ++        try {
> ++            raf.setLength(SIZE);
> ++            fs.transferFrom(Channels.newChannel(in), 0, SIZE);
> ++        } finally {
> ++            fs.close();
> ++        }
> ++
> ++        sourceChannel.close();
> ++        sinkChannel.close();
> ++        blah.delete();
^^^^^... but who cares.
> +     }
> +
> +     private static void initTestFile(File blah) throws IOException {
> +@@ -89,5 +107,6 @@
> +         }
> +        awriter.flush();
> +        awriter.close();
> ++       fos.close();
> +     }
> + }

approved.