From 816ff8f4bfa0009785d6b272932e041f28713e53 Mon Sep 17 00:00:00 2001
From: AMIT KUMAR <amit.kumar@tarento.com>
Date: Mon, 20 Dec 2021 16:46:08 +0530
Subject: [PATCH] Issue #SB-27557 feat: put null check for lastName (#1015)
---
.../java/org/sunbird/actor/role/FetchUserRoleActor.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/service/src/main/java/org/sunbird/actor/role/FetchUserRoleActor.java b/service/src/main/java/org/sunbird/actor/role/FetchUserRoleActor.java
index a96a207a7..0ca43e11e 100644
--- a/service/src/main/java/org/sunbird/actor/role/FetchUserRoleActor.java
+++ b/service/src/main/java/org/sunbird/actor/role/FetchUserRoleActor.java
@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.StringUtils;
import org.sunbird.actor.core.BaseActor;
import org.sunbird.keys.JsonKey;
import org.sunbird.request.Request;
@@ -50,8 +51,11 @@ public class FetchUserRoleActor extends BaseActor {
Map<String, Object> user =
userService.getUserDetailsById(userId, request.getRequestContext());
if (MapUtils.isNotEmpty(user)) {
- response.put(
- JsonKey.NAME, user.get(JsonKey.FIRST_NAME) + " " + user.get(JsonKey.LAST_NAME));
+ String name = (String) user.get(JsonKey.FIRST_NAME);
+ if (StringUtils.isNotEmpty((String) user.get(JsonKey.LAST_NAME))) {
+ name = name + " " + user.get(JsonKey.LAST_NAME);
+ }
+ response.put(JsonKey.NAME, name);
}
}
response.put(JsonKey.ROLES, userRoles);
--
GitLab