You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2016/11/04 21:04:02 UTC

incubator-ranger git commit: RANGER-1207: Good coding practices as recommended by static code analysis

Repository: incubator-ranger
Updated Branches:
  refs/heads/master aa474e74d -> 804753ed2


RANGER-1207: Good coding practices as recommended by static code analysis

Signed-off-by: Madhan Neethiraj <ma...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/804753ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/804753ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/804753ed

Branch: refs/heads/master
Commit: 804753ed2cfb15d87d1c46b2d180e03001547f74
Parents: aa474e7
Author: Abhay Kulkarni <ak...@hortonworks.com>
Authored: Fri Nov 4 10:47:52 2016 -0700
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Fri Nov 4 11:36:56 2016 -0700

----------------------------------------------------------------------
 .../plugin/policyevaluator/RangerDefaultPolicyItemEvaluator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/804753ed/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyItemEvaluator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyItemEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyItemEvaluator.java
index cace981..d2f6006 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyItemEvaluator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyItemEvaluator.java
@@ -84,7 +84,7 @@ public class RangerDefaultPolicyItemEvaluator extends RangerAbstractPolicyItemEv
 			}
 		}
 
-		if (!getConditionsDisabledOption() && policyItem != null && CollectionUtils.isNotEmpty(policyItem.getConditions())) {
+		if (!getConditionsDisabledOption() && CollectionUtils.isNotEmpty(policyItem.getConditions())) {
 			conditionEvaluators = new ArrayList<RangerConditionEvaluator>();
 
 			RangerPerfTracer perf = null;
@@ -127,7 +127,7 @@ public class RangerDefaultPolicyItemEvaluator extends RangerAbstractPolicyItemEv
 			RangerPerfTracer.log(perf);
 		}
 
-		List<String> users = policyItem != null ? policyItem.getUsers() : null;
+		List<String> users = policyItem.getUsers();
 		this.hasCurrentUser = CollectionUtils.isNotEmpty(users) && users.contains(RangerPolicyEngine.USER_CURRENT);
 		this.hasResourceOwner = CollectionUtils.isNotEmpty(users) && users.contains(RangerPolicyEngine.RESOURCE_OWNER);