From c181890be8a197426b2cee80692a2d34b288ff0d Mon Sep 17 00:00:00 2001 From: Thugutla sailakshmi Date: Mon, 21 Oct 2019 12:59:15 +0530 Subject: [PATCH] CMService.java - Merge the if statement with the existing one Issue-ID: AAF-876 Change-Id: I5cf734a6bce2afb0d4e24456cb037bb2421d7f96 Signed-off-by: Thugutla sailakshmi --- .../src/main/java/org/onap/aaf/auth/cm/service/CMService.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/service/CMService.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/service/CMService.java index 88109437..c85b4ca7 100644 --- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/service/CMService.java +++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/service/CMService.java @@ -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); - } } } } -- 2.16.6