Fix issues in fix-172

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java

@@ -159,15 +159,21 @@ public class UserManagementServiceImpl implements UserManagementService {
             List<String> tmpRoles = new ArrayList<>();
             String[] userInfoRoles = userInfo.getRoles();
             tmpRoles.add(DEFAULT_DEVICE_USER);
+
+            boolean subscriberFound = false;
+
             if (userInfoRoles != null) {
+
                 //check if subscriber role is coming in the payload
-                boolean subscriberFound = false;
                 for (String r : userInfoRoles) {
                     if (DEFAULT_SUBSCRIBER.equals(r)) {
                         subscriberFound = true;
                         break;
                     }
                 }
+                tmpRoles.addAll(Arrays.asList(userInfoRoles));
+            }
+
             if (!subscriberFound) {
                 // Add Internal/subscriber role to new users
                 if (userStoreManager.isExistingRole(DEFAULT_SUBSCRIBER)) {
@@ -177,8 +183,7 @@ public class UserManagementServiceImpl implements UserManagementService {
                              DEFAULT_SUBSCRIBER + "' is missing in the system");
                 }
             }
-                tmpRoles.addAll(Arrays.asList(userInfoRoles));
-            }
+            
             String[] roles = new String[tmpRoles.size()];
             tmpRoles.toArray(roles);