From 06525704dee59052f2df18a05c3e13b2de3e3d15 Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Sat, 1 Jun 2013 17:29:25 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87?=
 =?UTF-8?q?=D0=B0=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D1=8C=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?=
 =?UTF-8?q?=D0=B5=D1=82=20=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82=D0=BD?=
 =?UTF-8?q?=D0=BE.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../annimon/socketfiletransfer/FileOperation.java | 15 +++------------
 .../socketfiletransfer/MessageOperation.java      |  1 +
 .../socketfiletransfer/OperationListener.java     |  2 --
 src/com/annimon/socketfiletransfer/Server.java    |  2 +-
 .../socketfiletransfer/TransferServer.java        | 13 ++++---------
 5 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/src/com/annimon/socketfiletransfer/FileOperation.java b/src/com/annimon/socketfiletransfer/FileOperation.java
index de7dd25..5dbcfe3 100644
--- a/src/com/annimon/socketfiletransfer/FileOperation.java
+++ b/src/com/annimon/socketfiletransfer/FileOperation.java
@@ -33,20 +33,13 @@ public class FileOperation implements Operation {
         FileOutputStream fout = null;
         try {
             String name = dis.readUTF();
-            long length = dis.readLong();
             System.out.println("Filename: " + name);
-            System.out.println("Size: " + (length / 1024) + "kb");
             fout = new FileOutputStream(Config.getTransferDir() + name);
-            
-            for (long i = 0; i < length; i++) {
-                byte read = dis.readByte();
-                fout.write(read);
-            }
-            /*byte[] buffer = new byte[BUFFER_SIZE];
+            byte[] buffer = new byte[BUFFER_SIZE];
             int count;
-            while ((count = dis.read(buffer, 0, BUFFER_SIZE)) > 0) {
+            while ((count = dis.read(buffer, 0, BUFFER_SIZE)) != -1) {
                 fout.write(buffer, 0, count);
-            }*/
+            }
             fout.flush();
             fout.close();
         } catch (IOException ex) {
@@ -69,8 +62,6 @@ public class FileOperation implements Operation {
         String name = file.getName();
         dos.writeUTF(name);
         
-        dos.writeLong(file.length());
-        
         FileInputStream fis = new FileInputStream(file);
         byte[] buffer = new byte[BUFFER_SIZE];
         int count;
diff --git a/src/com/annimon/socketfiletransfer/MessageOperation.java b/src/com/annimon/socketfiletransfer/MessageOperation.java
index 28e0db5..c41a413 100644
--- a/src/com/annimon/socketfiletransfer/MessageOperation.java
+++ b/src/com/annimon/socketfiletransfer/MessageOperation.java
@@ -25,6 +25,7 @@ public class MessageOperation implements Operation {
     public void startServerSide() throws IOException {
         String text = dis.readUTF();
         MessageHistory.addMessage(text);
+        System.out.println(text);
     }
 
     @Override
diff --git a/src/com/annimon/socketfiletransfer/OperationListener.java b/src/com/annimon/socketfiletransfer/OperationListener.java
index 4733c9e..183ac9e 100644
--- a/src/com/annimon/socketfiletransfer/OperationListener.java
+++ b/src/com/annimon/socketfiletransfer/OperationListener.java
@@ -30,11 +30,9 @@ public class OperationListener {
 
     public void listenOperation() throws Exception {
         int mode = dis.readInt();
-        System.out.println("Read mode: " + mode);
         Operation operation;
         switch(mode) {
             case MODE_FILE_TRANSFER:
-                System.out.println("MODE_FILE_TRANSFER");
                 operation = new FileOperation(dis);
                 break;
             case MODE_MESSAGE_TRANSFER:
diff --git a/src/com/annimon/socketfiletransfer/Server.java b/src/com/annimon/socketfiletransfer/Server.java
index bbd5af6..f11df4b 100644
--- a/src/com/annimon/socketfiletransfer/Server.java
+++ b/src/com/annimon/socketfiletransfer/Server.java
@@ -43,5 +43,5 @@ public class Server {
             }
         }
     }
-    
+
 }
diff --git a/src/com/annimon/socketfiletransfer/TransferServer.java b/src/com/annimon/socketfiletransfer/TransferServer.java
index 8d251a6..30de8f1 100644
--- a/src/com/annimon/socketfiletransfer/TransferServer.java
+++ b/src/com/annimon/socketfiletransfer/TransferServer.java
@@ -19,15 +19,10 @@ public class TransferServer implements Runnable {
 
     @Override
     public void run() {
-        Thread thr = Thread.currentThread();
-        while(Thread.currentThread() == thr) {
-            try {
-                listener.listenOperation();
-                //Thread.sleep(1);
-            } catch (Exception ex) {
-                ExceptionHandler.handle(ex);
-                break;
-            }
+        try {
+            listener.listenOperation();
+        } catch (Exception ex) {
+            ExceptionHandler.handle(ex);
         }
         listener.close();
     }