Fixing null pointer when roles are not specified on creating new user

wso2 · Jan 23, 2017 · 704680d · 704680d
1 parent 9a0ba91
commit 704680d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...rc/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java b/...rc/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java
@@ -104,8 +104,11 @@ public Response addUser(UserInfo userInfo) {
  userInfo.getEmailAddress());
  // calling addUser method of carbon user api
  List<String> tmpRoles = new ArrayList<>();
+ String[] userInfoRoles = userInfo.getRoles();
  tmpRoles.add(DEFAULT_DEVICE_USER);
- tmpRoles.addAll(Arrays.asList(userInfo.getRoles()));
+ if (userInfoRoles != null) {
+ tmpRoles.addAll(Arrays.asList(userInfoRoles));
+ }
  String[] roles = new String[tmpRoles.size()];
  tmpRoles.toArray(roles);