--- old/src/share/classes/java/nio/file/Files.java	2013-07-21 01:54:40.253764845 +0400
+++ new/src/share/classes/java/nio/file/Files.java	2013-07-21 01:54:39.601773042 +0400
@@ -25,10 +25,10 @@
 
 package java.nio.file;
 
-import java.nio.ByteBuffer;
 import java.nio.file.attribute.*;
 import java.nio.file.spi.FileSystemProvider;
 import java.nio.file.spi.FileTypeDetector;
+import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
 import java.nio.channels.SeekableByteChannel;
 import java.io.Closeable;
@@ -38,6 +38,7 @@
 import java.io.Writer;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
+import java.io.ByteArrayOutputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.IOException;
@@ -2994,17 +2995,16 @@
             if (size > (long)Integer.MAX_VALUE)
                 throw new OutOfMemoryError("Required array size too large");
 
-            byte[] arr = new byte[(int)size];
-            ByteBuffer bb = ByteBuffer.wrap(arr);
-            while (bb.hasRemaining()) {
-                if (fc.read(bb) < 0) {
-                    // truncated
-                    break;
-                }
+            try (InputStream fis = Channels.newInputStream(fc);
+                 ByteArrayOutputStream bos = new ByteArrayOutputStream((int)size) {
+                     @Override
+                     public byte[] toByteArray() {
+                         return (buf.length == count) ? buf : Arrays.copyOf(buf, count);
+                     }
+                 }) {
+                copy(fis, bos);
+                return bos.toByteArray();
             }
-
-            int nread = bb.position();
-            return (nread == size) ? arr : Arrays.copyOf(arr, nread);
         }
     }