From 44288aebbfc62466e6e423c5041f5524ffc62d19 Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Mon, 21 May 2018 20:09:22 +0300 Subject: new unit tests for sdc-be Change-Id: I98f8a6c32f2603b55006ddd55789b72c1f1b050a Issue-ID: SDC-1333 Signed-off-by: Tal Gitelman --- .../java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'catalog-be/src/main/java/org') diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverter.java index f0c8ec214f..a5982c1f01 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverter.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverter.java @@ -82,7 +82,7 @@ public final class EcompUserConverter { convertedUser.setFirstName(ecompUser.getFirstName()); convertedUser.setLastName(ecompUser.getLastName()); - if (!ecompUser.getLoginId().isEmpty()) { + if (ecompUser.getLoginId() != null && !ecompUser.getLoginId().isEmpty()) { convertedUser.setUserId(ecompUser.getLoginId()); } else { convertedUser.setUserId(ecompUser.getOrgUserId()); -- cgit 1.2.3-korg