Remove Sonar Blockers

[aaf/authz.git] / auth / auth-cmd / src / main / java / org / onap / aaf / auth / cmd / AAFcli.java

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 7e25084..2d5e172 100644 (file)
--- 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
@@ -69,7 +69,7 @@ public class AAFcli {
        private List<Cmd> cmds;
 
        // Lex State
-       private ArrayList<Integer> expect = new ArrayList<Integer>();
+       private ArrayList<Integer> expect = new ArrayList<>();
        private boolean verbose = true;
        private int delay;
        private SecurityInfoC<HttpURLConnection> si;
@@ -113,7 +113,7 @@ public class AAFcli {
                /*
                 * Create Cmd Tree
                 */
-               cmds = new ArrayList<Cmd>();
+               cmds = new ArrayList<>();
 
                Role role = new Role(this);
                cmds.add(new Help(this, cmds));
@@ -358,7 +358,7 @@ public class AAFcli {
 
        private String[] argEval(String line) {
                StringBuilder sb = new StringBuilder();
-               ArrayList<String> arr = new ArrayList<String>();
+               ArrayList<String> arr = new ArrayList<>();
                boolean start = true;
                char quote = 0;
                char last = 0;
@@ -433,8 +433,10 @@ public class AAFcli {
                
                try {
                        AAFSSO aafsso = new AAFSSO(args);
+                       String noexit = aafsso.access().getProperty("no_exit");
                        try {
                                PropAccess access = aafsso.access();
+
                                if(aafsso.ok()) {
                                        Define.set(access);
                                        AuthzEnv env = new AuthzEnv(access);
@@ -589,21 +591,21 @@ public class AAFcli {
                        } finally {
                                aafsso.close();
                                StringBuilder err = aafsso.err();
-                               String noexit = aafsso.access().getProperty("no_exit");
                                if (err != null) {
                                        err.append("to continue...");
                                        System.err.println(err);
                                }
-                               if(noexit==null) {
-                                       return;
-                               }
-
                        }
+                       if(noexit==null) {
+                               return;
+                       }
+
+
                } catch (MessageException e) {
                        System.out.println("MessageException caught");
 
                        System.err.println(e.getMessage());
-               } catch (Throwable e) {
+               } catch (Exception e) {
                        e.printStackTrace(System.err);
                }
                System.exit(rv);