summaryrefslogtreecommitdiffstats
path: root/catalog-model/src/main/java/org/openecomp/sdc/be/model/User.java
diff options
context:
space:
mode:
Diffstat (limited to 'catalog-model/src/main/java/org/openecomp/sdc/be/model/User.java')
-rw-r--r--catalog-model/src/main/java/org/openecomp/sdc/be/model/User.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/User.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/User.java
index 129c35b708..b10214efe2 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/User.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/User.java
@@ -45,9 +45,9 @@ public class User {
public User() {
}
- public User(UserData userDate) {
- this(userDate.getFirstName(), userDate.getLastName(), userDate.getUserId(), userDate.getEmail(),
- userDate.getRole(), userDate.getLastLoginTime());
+ public User(UserData userData) {
+ this(userData.getFirstName(), userData.getLastName(), userData.getUserId(), userData.getEmail(),
+ userData.getRole(), userData.getLastLoginTime());
}
public User(String firstName, String lastName, String userId, String emailAddress, String role,
@@ -62,6 +62,9 @@ public class User {
}
public void copyData(User other) {
+ if(other == null) {
+ return;
+ }
this.firstName = other.getFirstName();
this.lastName = other.getLastName();
this.userId = other.getUserId();