fix hanging on AllData with large file

[jFCPlib.git] / src / main / java / net / pterodactylus / fcp / FcpUtils.java

diff --git a/src/main/java/net/pterodactylus/fcp/FcpUtils.java b/src/main/java/net/pterodactylus/fcp/FcpUtils.java
index 415cf1a..b83de58 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/FcpUtils.java
+++ b/src/main/java/net/pterodactylus/fcp/FcpUtils.java
@@ -1,9 +1,9 @@
 /*
- * jFCPlib - FcpUtils.java - Copyright © 2008 David Roden
+ * jFCPlib - FcpUtils.java - Copyright © 2008–2016 David Roden
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package net.pterodactylus.fcp;
@@ -268,7 +267,9 @@ public class FcpUtils {
                                throw new EOFException("stream reached eof");
                        }
                        destination.write(buffer, 0, read);
-                       remaining -= read;
+                       if (remaining > 0) {
+                               remaining -= read;
+                       }
                }
        }
 
@@ -352,7 +353,7 @@ public class FcpUtils {
                                FileOutputStream fileOutputStream = null;
                                try {
                                        fileOutputStream = new FileOutputStream(tempFile);
-                                       FcpUtils.copy(originalInputStream, fileOutputStream);
+                                       FcpUtils.copy(originalInputStream, fileOutputStream, length);
                                        fileInputStream = new FileInputStream(tempFile);
                                } finally {
                                        FcpUtils.close(fileOutputStream);