From fe5500299bb35d711eb505e8b51df2e9097a04cb Mon Sep 17 00:00:00 2001
From: dido18 <davideneri18@gmail.com>
Date: Thu, 19 May 2016 22:08:34 +0200
Subject: [PATCH] cli input==null with check

---
 app/pom.xml                                   |  2 +-
 .../java/com/dido/pad/cli/client/Cli.java     | 71 ++++++++++---------
 runDocker.sh                                  |  0
 3 files changed, 38 insertions(+), 35 deletions(-)
 mode change 100644 => 100755 runDocker.sh

diff --git a/app/pom.xml b/app/pom.xml
index 0298229..35760aa 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -37,7 +37,7 @@
                     <archive>
                         <manifest>
                             <addClasspath>true</addClasspath>
-                            <mainClass>com.dido.pad.PadFsNode</mainClass>
+                            <mainClass>com.dido.pad.app.AppRunner</mainClass>
                         </manifest>
                     </archive>
                 </configuration>
diff --git a/cli/src/main/java/com/dido/pad/cli/client/Cli.java b/cli/src/main/java/com/dido/pad/cli/client/Cli.java
index 63c3c01..e4f771f 100644
--- a/cli/src/main/java/com/dido/pad/cli/client/Cli.java
+++ b/cli/src/main/java/com/dido/pad/cli/client/Cli.java
@@ -101,49 +101,52 @@ public void runCli() {
                 "\t nodes           : shows the nodes active inthe system \n";
 
         System.out.print("\nInsert a command (h for usage message)");
+        String input = null;
         while(true){
 
             System.out.print("\n>> ");
-            String input = null;
+
             try {
                 input = bufferReader.readLine();
             } catch (IOException e) {
                 e.printStackTrace();
             }
+            if( input !=null) {
+                String[] cmds = input.split("\\s+"); //splits  white spaces
+
+                switch (cmds[0]) {
+                    case ("get"):
+                        String key = cmds[1];
+                        sendGetAndWait(key);
+                        break;
+                    case ("put"):
+                        String k = cmds[1];
+                        String v = cmds[2];
+                        sendPutAndWait(k, v);
+                        break;
+                    case ("list"):
+                        String ip = cmds[1];
+                        sendListAndWait(ip);
+                        break;
+                    case ("rm"):
+                        String Rmkey = cmds[1];
+                        sendRmAndWait(Rmkey);
+                        break;
+                    case ("nodes"):
+                        System.out.print(getcHasher().getAllNodes());
+                        break;
+                    case ("force"):
+                        String kk = cmds[1];
+                        String vv = cmds[2];
+                        String Ip = cmds[3];
+                        sendForce(kk, vv, Ip);
+                        ;
+                        break;
+                    case ("h"):
+                        System.out.print(help);
+                        break;
 
-            String[] cmds = input.split("\\s+"); //splits  white spaces
-
-            switch (cmds[0]) {
-                case ("get"):
-                    String key = cmds[1];
-                    sendGetAndWait(key);
-                    break;
-                case ("put"):
-                    String k = cmds[1];
-                    String v = cmds[2];
-                    sendPutAndWait(k,v);
-                    break;
-                case ("list"):
-                    String ip = cmds[1];
-                    sendListAndWait(ip);
-                    break;
-                case ("rm"):
-                    String Rmkey = cmds[1];
-                    sendRmAndWait(Rmkey);
-                    break;
-                case ("nodes"):
-                    System.out.print(getcHasher().getAllNodes());
-                    break;
-                case ("force"):
-                    String kk = cmds[1];
-                    String vv = cmds[2];
-                    String Ip = cmds[3];
-                    sendForce(kk, vv, Ip);;
-                    break;
-                case ("h"):
-                    System.out.print(help);
-                    break;
-
+                }
             }
         }
     }
diff --git a/runDocker.sh b/runDocker.sh
old mode 100644
new mode 100755