Merge pull request #258 from jcarvalho/handle-misbehaving-inputstreams

[io] DownloadUtil can now handle misbehaving InputStreams
FenixEdu · Dec 10, 2015 · 606357f · 606357f
2 parents 150722d + 55d8e8e
commit 606357f
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/bennu-io/src/main/java/org/fenixedu/bennu/io/util/DownloadUtil.java b/bennu-io/src/main/java/org/fenixedu/bennu/io/util/DownloadUtil.java
@@ -145,19 +145,18 @@ public static void downloadFile(GenericFile file, HttpServletRequest request, Ht
     private static void copyStream(InputStream in, OutputStream out, long start, long bytesToRead) throws IOException {
         ByteStreams.skipFully(in, start);
         byte buffer[] = new byte[BUF_SIZE];
-        int len = buffer.length;
-        while ((bytesToRead > 0) && (len >= buffer.length)) {
-            len = in.read(buffer);
+        while (bytesToRead > 0) {
+            int len = in.read(buffer);
+            if (len == -1) {
+                break;
+            }
             if (bytesToRead >= len) {
                 out.write(buffer, 0, len);
                 bytesToRead -= len;
             } else {
                 out.write(buffer, 0, (int) bytesToRead);
                 bytesToRead = 0;
             }
-            if (len < buffer.length) {
-                break;
-            }
         }
     }