summaryrefslogtreecommitdiffstats
path: root/catalog-be/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'catalog-be/src/main')
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverter.java2
1 files changed, 1 insertions, 1 deletions
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());