You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ab...@apache.org on 2019/10/08 20:01:27 UTC
[ranger] branch master updated: RANGER-2610: NPE in PolicyRefresher
if service-policies in policy-cache contain only service definition
This is an automated email from the ASF dual-hosted git repository.
abhay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new fb97a18 RANGER-2610: NPE in PolicyRefresher if service-policies in policy-cache contain only service definition
fb97a18 is described below
commit fb97a18b5f409dc7beb9c0ed5ec43c9daad89f41
Author: Abhay Kulkarni <ab...@apache.org>
AuthorDate: Tue Oct 8 12:33:08 2019 -0700
RANGER-2610: NPE in PolicyRefresher if service-policies in policy-cache contain only service definition
---
.../org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java | 2 +-
.../src/main/java/org/apache/ranger/plugin/util/PolicyRefresher.java | 2 +-
2 files changed, 2 insertions(+), 2 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 b81f50c..45b223d 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
@@ -96,7 +96,7 @@ public class RangerPolicyEngineImpl implements RangerPolicyEngine {
public RangerPolicyEngineImpl(final RangerPolicyEngineImpl other, ServicePolicies servicePolicies, RangerRoles rangerRoles) {
- long policyVersion = servicePolicies.getPolicyVersion();
+ long policyVersion = servicePolicies.getPolicyVersion() != null ? servicePolicies.getPolicyVersion() : -1L;
this.useForwardedIPAddress = other.useForwardedIPAddress;
this.trustedProxyAddresses = other.trustedProxyAddresses;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/PolicyRefresher.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/PolicyRefresher.java
index d4d7902..7ec8495 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/PolicyRefresher.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/PolicyRefresher.java
@@ -210,7 +210,7 @@ public class PolicyRefresher extends Thread {
plugIn.setPolicies(svcPolicies);
policiesSetInPlugin = true;
setLastActivationTimeInMillis(System.currentTimeMillis());
- lastKnownVersion = svcPolicies.getPolicyVersion();
+ lastKnownVersion = svcPolicies.getPolicyVersion() != null ? svcPolicies.getPolicyVersion() : -1L;
} else {
if (!policiesSetInPlugin && !serviceDefSetInPlugin) {
plugIn.setPolicies(null);