Merge pull request voldemort#88 from jghoman/badarraycopy

Don't make a copy of the buffer, as it may shrink down to one elemnent.
sathyaphoenix · Jul 31, 2012 · 1b895b2 · 1b895b2
2 parents 0aa7f42 + 40a3d99
commit 1b895b2
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/fetcher/HdfsFetcher.java b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/fetcher/HdfsFetcher.java
@@ -16,6 +16,7 @@
 
 package voldemort.store.readonly.fetcher;
 
+import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -283,16 +284,16 @@ private void copyFileWithCheckSum(FileSystem fs,
         OutputStream output = null;
         try {
             input = fs.open(source);
-            output = new FileOutputStream(dest);
+            output = new BufferedOutputStream(new FileOutputStream(dest));
             byte[] buffer = new byte[bufferSize];
             while(true) {
                 int read = input.read(buffer);
                 if(read < 0) {
                     break;
-                } else if(read < bufferSize) {
-                    buffer = ByteUtils.copy(buffer, 0, read);
+                } else {
+	                output.write(buffer, 0, read);
                 }
-                output.write(buffer);
+
                 if(fileCheckSumGenerator != null)
                     fileCheckSumGenerator.update(buffer);
                 if(throttler != null)