RANGER-2979: fix for NPE in unit-test
(cherry picked from commit bda27055c1d7b2df1a2e70a7a9c035759420803b)
diff --git a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
index e54f93a..d2b7807 100644
--- a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
+++ b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
@@ -347,7 +347,13 @@ private Set<String> getCurrentRoleNamesFromRanger() throws HiveAuthzPluginExcept
if (LOG.isDebugEnabled()) {
LOG.debug("<== getCurrentRoleNamesFromRanger() for user " + user);
}
- Set<String> userRoles = new HashSet<String>(hivePlugin.getUserRoles(user, auditHandler));
+
+ List<String> userRoles = hivePlugin.getUserRoles(user, auditHandler);
+
+ if (userRoles == null) {
+ userRoles = Collections.emptyList();
+ }
+
for (String role : userRoles) {
if (!ROLE_ADMIN.equalsIgnoreCase(role)) {
ret.add(role);
