From 62cd6aaaf74aa91ee0037c0e155c8e7284f07567 Mon Sep 17 00:00:00 2001 From: Arthur Martella Date: Fri, 8 Sep 2017 13:27:46 -0400 Subject: 1710 Rebase - Second Attempt This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit: 54483fc6606ddb1591a2e9da61bff8712325f924 Wed Sep 6 18:12:56 2017 -0400 Rebasing was done on a branch on top of this commit in so/master in ONAP: 93fbdfbe46104f8859d4754040f979cb7997c157 Thu Sep 7 16:42:59 2017 +0000 Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59 Issue-id: SO-107 Signed-off-by: Arthur Martella --- .../src/main/java/org/openecomp/mso/cloud/CloudIdentity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudIdentity.java') diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudIdentity.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudIdentity.java index db6ccde46c..0f15dea577 100644 --- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudIdentity.java +++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudIdentity.java @@ -270,9 +270,9 @@ public class CloudIdentity { .append (", tenantMetadata=") .append (tenantMetadata) .append (", identityServerType=") - .append (identityServerType.toString()) + .append (identityServerType == null ? "null" : identityServerType.toString()) .append (", identityAuthenticationType=") - .append (identityAuthenticationType.toString()); + .append (identityAuthenticationType == null ? "null" : identityAuthenticationType.toString()); return stringBuilder.toString (); } -- cgit 1.2.3-korg