summaryrefslogtreecommitdiffstats
path: root/catalog-be/src/main/java
diff options
context:
space:
mode:
authorTal Gitelman <tg851x@intl.att.com>2018-05-21 20:09:22 +0300
committerMichael Lando <ml636r@att.com>2018-05-22 10:38:48 +0000
commit44288aebbfc62466e6e423c5041f5524ffc62d19 (patch)
tree655335043c4a1092fd2b410c7759d87809cc65b0 /catalog-be/src/main/java
parenta1e1776d772f41b9102efee4c5a0b8c2032a83f5 (diff)
new unit tests for sdc-be
Change-Id: I98f8a6c32f2603b55006ddd55789b72c1f1b050a Issue-ID: SDC-1333 Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Diffstat (limited to 'catalog-be/src/main/java')
-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());