RANGER-5061: Fix for Admin audit page loading failure

Change-Id: Ib7241c3d2673a358c3753cb035e9a14a6e6be5a4
apache · Jan 21, 2025 · 6a25e84 · 6a25e84
1 parent 9f9bf0f
commit 6a25e84
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java b/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java
@@ -22,6 +22,7 @@
  */
 package org.apache.ranger.common;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -474,7 +475,7 @@ protected StringBuilder buildWhereClause(SearchCriteria searchCriteria, List<Sea
                     intValueList = (Collection<Number>) paramValue;
                 }
 
-                if (!intValueList.isEmpty()) {
+                if (CollectionUtils.isNotEmpty(intValueList)) {
                     if (searchField.getCustomCondition() == null) {
                         if (intValueList.size() <= minInListLength) {
                             whereClause.append(" and ");
@@ -623,15 +624,15 @@ protected void resolveQueryParams(Query query, SearchCriteria searchCriteria, Li
                     intValueList = (Collection<Number>) paramValue;
                 }
 
-                if (!intValueList.isEmpty() && intValueList.size() <= minInListLength) {
+                if (CollectionUtils.isNotEmpty(intValueList) && intValueList.size() <= minInListLength) {
                     int count = -1;
 
                     for (Number value : intValueList) {
                         count++;
 
                         query.setParameter(searchField.getClientFieldName() + "_" + count, value);
                     }
-                } else if (intValueList.size() > 1) {
+                } else if (CollectionUtils.isNotEmpty(intValueList) && intValueList.size() > 1) {
                     query.setParameter(searchField.getClientFieldName(), intValueList);
                 }
             } else if (searchField.getDataType() == SearchField.DATA_TYPE.STR_LIST) {