Fix to make sure that FileChannel.transferFrom() throws a NonReadableChannelException when the source is a write-only FileChannel.

1 files changed, 12 insertions, 0 deletions

diff --git a/openjdk/sun/nio/ch/FileChannelImpl.java b/openjdk/sun/nio/ch/FileChannelImpl.java
index 6a27b012..86049d69 100644
--- a/openjdk/sun/nio/ch/FileChannelImpl.java
+++ b/openjdk/sun/nio/ch/FileChannelImpl.java
@@ -435,6 +435,15 @@ public class FileChannelImpl
         return transferToArbitraryChannel(position, icount, target);
     }
 
+    private long transferFromFileChannel(FileChannelImpl src,
+                                         long position, long count)
+        throws IOException
+    {
+        if (!src.readable)
+            throw new NonReadableChannelException();
+        return transferFromArbitraryChannel(src, position, count);
+    }
+
     private static final int TRANSFER_SIZE = 8192;
 
     private long transferFromArbitraryChannel(ReadableByteChannel src,
@@ -483,6 +492,9 @@ public class FileChannelImpl
             throw new IllegalArgumentException();
         if (position > size())
             return 0;
+        if (src instanceof FileChannelImpl)
+           return transferFromFileChannel((FileChannelImpl)src,
+                                          position, count);
 
         return transferFromArbitraryChannel(src, position, count);
     }