From: Jonathan Gathman <jonathan.gathman@att.com>
Date: Thu, 19 Sep 2019 15:40:26 +0000 (+0000)
Subject: Merge "AAFcli.java-Merge the if statement with the existing one"
X-Git-Tag: 2.1.17~115
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=586d2253e528ad96cbf9817a1cd440874e7bc26c;hp=28fe822b2ac836ad3e75e0fa68fda29229ac4cfc;p=aaf%2Fauthz.git

Merge "AAFcli.java-Merge the if statement with the existing one"
---

diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/AAFcli.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/AAFcli.java
index 44d86d3c..bd8f1a52 100644
--- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/AAFcli.java
+++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/AAFcli.java
@@ -215,8 +215,7 @@ public class AAFcli {
                     }
                 } else if ("expect".equalsIgnoreCase(largs[idx])) {
                     expect.clear();
-                    if (largs.length > idx++) {
-                        if (!"nothing".equals(largs[idx])) {
+                    if ((largs.length > idx++)&&(!"nothing".equals(largs[idx]))) {
                             for (String str : largs[idx].split(",")) {
                                 try {
                                     if ("Exception".equalsIgnoreCase(str)) {
@@ -229,8 +228,7 @@ public class AAFcli {
                                 }
                             }
                         ++idx;
-                        }
-                    }
+                }
                     continue;
                     // Sleep, typically for reports, to allow DB to update
                     // Milliseconds