TD2: Ensure chat clients will not send empty message.

[TD_SR.git] / TD2 / client / ThreadClientoSend.java

diff --git a/TD2/client/ThreadClientoSend.java b/TD2/client/ThreadClientoSend.java
index 53fdeb07addee6917201d274057b4156a39dd0ab..1d7e232ffd794bde82be90199f8662d283cf02f7 100644 (file)
--- a/TD2/client/ThreadClientoSend.java
+++ b/TD2/client/ThreadClientoSend.java
@@ -4,8 +4,7 @@ import java.util.Random;
 
 public class ThreadClientoSend implements Runnable {
     private SocketClient client;
-    //FIXME: use a random name by thread for now
-    //       should setable
+    //FIXME: use a random name by thread for now, should be setable
     private String randName;
 
     ThreadClientoSend(SocketClient c) {
@@ -34,14 +33,16 @@ public class ThreadClientoSend implements Runnable {
         try {
             userInput = new BufferedReader(new InputStreamReader(System.in));
             boolean end = false;
-                       while (!end) {
-                               String line = userInput.readLine();
-                               if (line.equals(".")) {
+            while (!end) {
+                String line = userInput.readLine();
+                if (line.equals(".")) {
                     end = true;
                 }
-                Message oMsg = new Message(randName, line, Calendar.getInstance());
-                client.sendoMsg(oMsg);
-                System.out.println(Thread.currentThread().getName() + " a envoye " + oMsg);
+                if (line.length() != 0) {
+                    Message oMsg = new Message(randName, line, Calendar.getInstance());
+                    client.sendoMsg(oMsg);
+                    System.out.println(Thread.currentThread().getName() + " a envoye " + oMsg);
+                }
             }
            }
         catch (IOException e) {
@@ -50,13 +51,14 @@ public class ThreadClientoSend implements Runnable {
         }
         finally {
             if (userInput != null) {
-                               try {
-                                       userInput.close();
-                               }
-                               catch (IOException e) {
-                                       System.err.println("IOException: " + e);
-                               }
-                       }
+                try {
+                    userInput.close();
+                }
+                catch (IOException e) {
+                    System.err.println("IOException: " + e);
+                    e.printStackTrace();
+                }
+            }
         }
     }
 }