This is an automated email from the ASF dual-hosted git repository.

madhan pushed a commit to branch ranger-2.6
in repository https://gitbox.apache.org/repos/asf/ranger.git

commit 7bfa8924106cb66d3b5d7e2cbd4f5d505c575bba
Author: Fateh Singh <[email protected]>
AuthorDate: Mon Nov 25 14:04:32 2024 -0800

    RANGER-5001: Resolve merge conflicts to fix compilation failure (#415)
    
    (cherry picked from commit 925ed231184848eada7c5ba86f312c12975412e5)
---
 .../apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git 
a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java
 
b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java
index 514a52c82..fea465dee 100644
--- 
a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java
+++ 
b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java
@@ -687,13 +687,7 @@ public class RangerPolicyEngineImpl implements 
RangerPolicyEngine {
                final RangerAccessResult ret;
 
                if (request.isAccessTypeAny()) {
-                       List<RangerServiceDef.RangerAccessTypeDef> 
allAccessDefs = getServiceDef().getAccessTypes();
-
-                       Set<String> allRequestedAccesses = new HashSet<>();
-                       for (RangerServiceDef.RangerAccessTypeDef accessTypeDef 
: allAccessDefs) {
-                               String requestedAccess = 
accessTypeDef.getName();
-                               allRequestedAccesses.add(requestedAccess);
-                       }
+                       Set<String> allRequestedAccesses = 
getServiceDefHelper().getAllAccessTypes();
                        
RangerAccessRequestUtil.setAllRequestedAccessTypes(request.getContext(), 
allRequestedAccesses);
                        
RangerAccessRequestUtil.setIsAnyAccessInContext(request.getContext(), 
Boolean.TRUE);
                        if (!request.ignoreDescendantDeny()) {

Reply via email to