changeset 47724:24e43fd1ad69

8190500: (ch) ReadableByteChannelImpl::read and WritableByteChannelImpl::write might not throw ClosedChannelException as specified Summary: Explicitly verify that the channel is open Reviewed-by: alanb
author bpb
date Fri, 03 Nov 2017 10:18:27 -0700
parents 843c071258a6
children 6278140a2d55
files src/java.base/share/classes/java/nio/channels/Channels.java test/jdk/java/nio/channels/Channels/Basic.java
diffstat 2 files changed, 47 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/classes/java/nio/channels/Channels.java	Fri Nov 03 13:03:10 2017 -0400
+++ b/src/java.base/share/classes/java/nio/channels/Channels.java	Fri Nov 03 10:18:27 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -368,6 +368,10 @@
 
         @Override
         public int read(ByteBuffer dst) throws IOException {
+            if (!isOpen()) {
+                throw new ClosedChannelException();
+            }
+
             int len = dst.remaining();
             int totalRead = 0;
             int bytesRead = 0;
@@ -442,6 +446,10 @@
 
         @Override
         public int write(ByteBuffer src) throws IOException {
+            if (!isOpen()) {
+                throw new ClosedChannelException();
+            }
+
             int len = src.remaining();
             int totalWritten = 0;
             synchronized (writeLock) {
--- a/test/jdk/java/nio/channels/Channels/Basic.java	Fri Nov 03 13:03:10 2017 -0400
+++ b/test/jdk/java/nio/channels/Channels/Basic.java	Fri Nov 03 10:18:27 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -167,6 +167,11 @@
             readAndCheck(blah);
             blah.delete();
 
+            testNewChannelWriteAfterClose(blah);
+
+            testNewChannelReadAfterClose(blah);
+            blah.delete();
+
             writeOut(blah, ITERATIONS);
             testNewChannelIn(blah);
             test4481572(blah);
@@ -255,6 +260,7 @@
     private static void testNewChannelOut(File blah) throws Exception {
         ExtendedFileOutputStream fos = new ExtendedFileOutputStream(blah);
         WritableByteChannel wbc = Channels.newChannel(fos);
+
         for (int i=0; i<ITERATIONS; i++)
             wbc.write(ByteBuffer.wrap(message.getBytes(encoding)));
         wbc.close();
@@ -287,6 +293,37 @@
         fis.close();
     }
 
+    private static void testNewChannelWriteAfterClose(File blah)
+        throws Exception {
+        try (ExtendedFileOutputStream fos =
+            new ExtendedFileOutputStream(blah)) {
+            WritableByteChannel wbc = Channels.newChannel(fos);
+
+            wbc.close();
+            try {
+                wbc.write(ByteBuffer.allocate(0));
+                throw new RuntimeException
+                    ("No ClosedChannelException on WritableByteChannel::write");
+            } catch (ClosedChannelException expected) {
+            }
+        }
+    }
+
+    private static void testNewChannelReadAfterClose(File blah)
+        throws Exception {
+        try (ExtendedFileInputStream fis = new ExtendedFileInputStream(blah)) {
+            ReadableByteChannel rbc = Channels.newChannel(fis);
+
+            rbc.close();
+            try {
+                rbc.read(ByteBuffer.allocate(0));
+                throw new RuntimeException
+                    ("No ClosedChannelException on ReadableByteChannel::read");
+            } catch (ClosedChannelException expected) {
+            }
+        }
+    }
+
     // Causes BufferOverflowException if bug 4481572 is present.
     private static void test4481572(File blah) throws Exception {
         ExtendedFileInputStream fis = new ExtendedFileInputStream(blah);