Reviewer needed - patch for regression test openjdk/jdk/test/java/nio/MappedByteBuffer/Basic.java for IcedTea6 HEAD

[Jiri Vanek]

In case that filestream is not closed properly, then file blah is not deleted. But I believe that it just sielntly return false which nobody cares. And I also believe that it can happen just in minor number of runs.
Feel free to commit.

J.

On 06/22/2011 02:01 PM, Pavel Tisnovsky wrote:
> Hi all,
>
> I'd like to push patch for regression test
> openjdk/jdk/test/java/nio/MappedByteBuffer/Basic.java into IcedTea6
> HEAD. This patch ensures that this regression test deletes all its work
> files stored in /tmp directory.
>
> 2011-06-22  Pavel Tisnovsky<ptisnovs at redhat.com>
>
>          * Makefile.am: added new patch
>          * patches/jtreg-MappedByteBuffer-Basic.patch:
>          Make sure that the regression test
>          openjdk/jdk/test/java/nio/MappedByteBuffer/Basic.java
>          deletes all its work files.
>
> Can anybody please review this change?
>
> Thank you in advance,
> Pavel
>
>
> jtreg-MappedByteBuffer-Basic.patch
>
>
> --- openjdk.orig/jdk/test/java/nio/MappedByteBuffer/Basic.java	2011-06-16 00:15:19.000000000 +0200
> +++ openjdk/jdk/test/java/nio/MappedByteBuffer/Basic.java	2011-06-16 16:13:50.000000000 +0200
> @@ -35,45 +35,56 @@
>           byte[] srcData = new byte[20];
>           for (int i=0; i<20; i++)
>               srcData[i] = 3;
> -        File blah = File.createTempFile("blah", null);
> -        blah.deleteOnExit();
> -        FileOutputStream fos = new FileOutputStream(blah);
> -        FileChannel fc = fos.getChannel();
> -        fc.write(ByteBuffer.wrap(srcData));
> -        fc.close();
> -        fos.close();
> +        File blah = null;
> +        try {
> +            blah = File.createTempFile("blah", null);
> +            blah.deleteOnExit();
> +            FileOutputStream fos = new FileOutputStream(blah);
> +            FileChannel fc = fos.getChannel();
> +            fc.write(ByteBuffer.wrap(srcData));
> +            fc.close();
> +            fos.close();
>
> -        FileInputStream fis = new FileInputStream(blah);
> -        fc = fis.getChannel();
> -        MappedByteBuffer mbb = fc.map(FileChannel.MapMode.READ_ONLY, 0, 10);
> -        mbb.load();
> -        mbb.isLoaded();
> -        mbb.force();
> -        if (!mbb.isReadOnly())
> -            throw new RuntimeException("Incorrect isReadOnly");
> +            FileInputStream fis = new FileInputStream(blah);
> +            fc = fis.getChannel();
> +            MappedByteBuffer mbb = fc.map(FileChannel.MapMode.READ_ONLY, 0, 10);
> +            mbb.load();
> +            mbb.isLoaded();
> +            mbb.force();
> +            if (!mbb.isReadOnly()) {
> +                throw new RuntimeException("Incorrect isReadOnly");
> +            }
>
> -        // repeat with unaligned position in file
> -        mbb = fc.map(FileChannel.MapMode.READ_ONLY, 1, 10);
> -        mbb.load();
> -        mbb.isLoaded();
> -        mbb.force();
> -        fc.close();
> -        fis.close();
> +            // repeat with unaligned position in file
> +            mbb = fc.map(FileChannel.MapMode.READ_ONLY, 1, 10);
> +            mbb.load();
> +            mbb.isLoaded();
> +            mbb.force();
> +            fc.close();
> +            fis.close();
>
> -        RandomAccessFile raf = new RandomAccessFile(blah, "r");
> -        fc = raf.getChannel();
> -        mbb = fc.map(FileChannel.MapMode.READ_ONLY, 0, 10);
> -        if (!mbb.isReadOnly())
> -            throw new RuntimeException("Incorrect isReadOnly");
> -        fc.close();
> -        raf.close();
> +            RandomAccessFile raf = new RandomAccessFile(blah, "r");
> +            fc = raf.getChannel();
> +            mbb = fc.map(FileChannel.MapMode.READ_ONLY, 0, 10);
> +            if (!mbb.isReadOnly()) {
> +                throw new RuntimeException("Incorrect isReadOnly");
> +            }
> +            fc.close();
> +            raf.close();
>
> -        raf = new RandomAccessFile(blah, "rw");
> -        fc = raf.getChannel();
> -        mbb = fc.map(FileChannel.MapMode.READ_WRITE, 0, 10);
> -        if (mbb.isReadOnly())
> -            throw new RuntimeException("Incorrect isReadOnly");
> -        fc.close();
> -        raf.close();
> +            raf = new RandomAccessFile(blah, "rw");
> +            fc = raf.getChannel();
> +            mbb = fc.map(FileChannel.MapMode.READ_WRITE, 0, 10);
> +            if (mbb.isReadOnly()) {
> +                throw new RuntimeException("Incorrect isReadOnly");
> +            }
> +            fc.close();
> +            raf.close();
> +        }
> +        finally {
> +            if (blah != null) {
> +                blah.delete();
> +            }
> +        }
>       }
>   }