Merge "CMService.java - Merge the if statement with the existing one"
authorJonathan Gathman <jonathan.gathman@att.com>
Wed, 6 Nov 2019 12:34:10 +0000 (12:34 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 6 Nov 2019 12:34:10 +0000 (12:34 +0000)
auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/service/CMService.java

index 8810943..c85b4ca 100644 (file)
@@ -3,7 +3,7 @@
  * org.onap.aaf
  * ===========================================================================
  * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2018 IBM.
+ * Modifications Copyright (C) 2019 IBM.
  * ===========================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -334,12 +334,10 @@ public class CMService {
                             trans.error().log("CMService var primary is null");
                         } else {
                             String fg = fqdns.get(i);
-                            if (fg!=null && primary!=null && fg.equals(primary.getHostName())) {
-                                if (i != 0) {
+                            if ((fg!=null && primary!=null && fg.equals(primary.getHostName()))&&(i != 0)) {
                                     String tmp = fqdns.get(0);
                                     fqdns.set(0, primary.getHostName());
                                     fqdns.set(i, tmp);
-                                }
                             }
                         }
                     }