From: Sharon Aicler <saichler@cisco.com>
Date: Tue, 23 Sep 2014 18:40:46 +0000 (-0700)
Subject: Bug#2056 odl:xsql karaf command is throwing NPE when empty args
X-Git-Tag: release/helium~13
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=dad1d89e4c39144579acfaf8d194a96765cd14c4;hp=-c

Bug#2056 odl:xsql karaf command is throwing NPE when empty args

Change-Id: I60b6321aea4e02e4a7b409645bc8ebcec9a39112
Signed-off-by: Sharon Aicler <saichler@cisco.com>
---

dad1d89e4c39144579acfaf8d194a96765cd14c4
diff --git a/opendaylight/md-sal/sal-karaf-xsql/src/main/java/org/opendaylight/controller/xsql/xsql.java b/opendaylight/md-sal/sal-karaf-xsql/src/main/java/org/opendaylight/controller/xsql/xsql.java
index b7994dc1bf..9f0266c19d 100644
--- a/opendaylight/md-sal/sal-karaf-xsql/src/main/java/org/opendaylight/controller/xsql/xsql.java
+++ b/opendaylight/md-sal/sal-karaf-xsql/src/main/java/org/opendaylight/controller/xsql/xsql.java
@@ -16,6 +16,10 @@ public class xsql extends OsgiCommandSupport {
     private String argument;
 
     protected Object doExecute() throws Exception {
+        if(argument==null){
+            System.out.println("Nothing to do..., please specify a command.");
+            return null;
+        }
         XSQLAdapter.getInstance().processCommand(new StringBuffer(argument),
                 System.out);
         return null;