Improve logging and avoid null chance

Issue-ID: CLI-92

Change-Id: I681f605a1cb52ff548c03b5510452cafb648bae9
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

diff --git a/main/src/main/java/org/onap/cli/main/OnapCli.java b/main/src/main/java/org/onap/cli/main/OnapCli.java
index b8af6f5..443b86f 100644 (file)
--- a/main/src/main/java/org/onap/cli/main/OnapCli.java
+++ b/main/src/main/java/org/onap/cli/main/OnapCli.java
@@ -377,6 +377,7 @@ public class OnapCli {
 
                 generateSmapleYaml(cmd);
             } catch (OnapCommandWarning w) {
+                this.print(w);
                 this.print(cmd.getResult().getDebugInfo());
                 this.exitSuccessfully();
             } catch (Exception e) {

diff --git a/profiles/snmp/src/main/java/org/onap/cli/fw/snmp/cmd/OnapSnmpCommand.java b/profiles/snmp/src/main/java/org/onap/cli/fw/snmp/cmd/OnapSnmpCommand.java
index cf2d91d..6bdc9a0 100644 (file)
--- a/profiles/snmp/src/main/java/org/onap/cli/fw/snmp/cmd/OnapSnmpCommand.java
+++ b/profiles/snmp/src/main/java/org/onap/cli/fw/snmp/cmd/OnapSnmpCommand.java
@@ -120,7 +120,7 @@ public class OnapSnmpCommand extends OnapCommand {
 
                 case OnapCommandSnmpConstants.SNMP_CMD_GET:
                     ResponseEvent responseEvent = snmp.send(getPDU(PDU.GET, oidStrArr), getTarget(), null);
-                    if ( responseEvent != null || responseEvent.getResponse().getErrorStatus() == PDU.noError) {
+                    if ( responseEvent != null && responseEvent.getResponse().getErrorStatus() == PDU.noError) {
                         Vector<? extends VariableBinding> variableBindings = responseEvent.getResponse().getVariableBindings();
                         variableBindings.stream().forEach(varBinding -> { //NOSONAR
                             String key = getKeyForValue(varBinding.getOid().toString());