Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	Dozentenmodulserver/bin/server/ServerHandler.class

1 files changed, 2 insertions, 1 deletions

diff --git a/Dozentenmodul/src/ftp/UploadTask.java b/Dozentenmodul/src/ftp/UploadTask.java
index 2dbeff8d..06d76dc8 100644
--- a/Dozentenmodul/src/ftp/UploadTask.java
+++ b/Dozentenmodul/src/ftp/UploadTask.java
@@ -49,6 +49,7 @@ public class UploadTask extends SwingWorker<Void, Void> {
             FileInputStream inputStream = new FileInputStream(uploadFile);
             byte[] buffer = new byte[BUFFER_SIZE];
             int bytesRead = -1;
+            int i=0;
             long totalBytesRead = 0;
             int percentCompleted = 0;
             long fileSize = uploadFile.length();
@@ -57,7 +58,7 @@ public class UploadTask extends SwingWorker<Void, Void> {
             final double NANOS_PER_SECOND = 1000000000.0;
             final double BYTES_PER_MIB = 1024*1024;
             while ((bytesRead = inputStream.read(buffer)) != -1 && isCancelled()==false) {
-                util.writeFileBytes(buffer, 0, bytesRead);
+            	util.writeFileBytes(buffer, 0, bytesRead);
                 totalBytesRead += bytesRead;
                 percentCompleted = (int) (totalBytesRead * 100 / fileSize);
                 double speed = NANOS_PER_SECOND / BYTES_PER_MIB * totalBytesRead / (System.nanoTime() - start + 1);