Avoid any empty tokens

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@961323 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 1 deletions

diff --git a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
index c94a2f19fe..d55607444c 100644
--- a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
+++ b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
@@ -262,7 +262,14 @@ public class Shell {
             l = ((BufferedReader)r).readLine();

             history.add(l);

         }

-        return Arrays.asList(l != null? l.trim().split(" ") : "stop".split(" "));

+        String[] toks = l != null? l.trim().split(" ") : "stop".split(" ");

+        List<String> toksList = new ArrayList<String>();

+        for (String s : toks) {

+            if (s != null && s.trim().length()>0) {

+                toksList.add(s);

+            }

+        }

+        return toksList;

     }

 

     Callable<Boolean> eval(final List<String> toks) {