RANGER-494 Coverity scan issues with RangerPolicyResourceSignature: toString should not return null
Signed-off-by: Madhan Neethiraj <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/18595792 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/18595792 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/18595792 Branch: refs/heads/tag-policy Commit: 18595792f3b47b69eee652cb1136426dd3b9b113 Parents: a2c9654 Author: Alok Lal <[email protected]> Authored: Tue May 19 01:17:25 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Tue May 19 08:45:06 2015 -0700 ---------------------------------------------------------------------- .../ranger/plugin/model/RangerPolicyResourceSignature.java | 9 ++------- .../plugin/model/TestRangerPolicyResourceSignature.java | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/18595792/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java index 6d19f44..76d853a 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java @@ -44,12 +44,7 @@ public class RangerPolicyResourceSignature { public RangerPolicyResourceSignature(RangerPolicy policy) { _policy = policy; PolicySerializer serializer = new PolicySerializer(_policy); - String asString = serializer.toString(); - if (asString == null) { - _string = ""; - } else { - _string = asString; - } + _string = serializer.toString(); _hash = DigestUtils.md5Hex(_string); } @@ -128,7 +123,7 @@ public class RangerPolicyResourceSignature { // invalid/empty policy gets a deterministic signature as if it had an // empty resource string if (!isPolicyValidForResourceSignatureComputation()) { - return null; + return ""; } int type = 0; if (_policy.getPolicyType() != null) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/18595792/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicyResourceSignature.java ---------------------------------------------------------------------- diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicyResourceSignature.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicyResourceSignature.java index a605cd7..8c8c4c0 100644 --- a/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicyResourceSignature.java +++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicyResourceSignature.java @@ -154,7 +154,7 @@ public class TestRangerPolicyResourceSignature { // null policy returns signature of empty resource RangerPolicy policy = null; PolicySerializer serializer = new PolicySerializer(policy); - assertTrue("Null policy", serializer.toString() == null); + assertTrue("Null policy", serializer.toString() == ""); policy = mock(RangerPolicy.class); when(policy.getPolicyType()).thenReturn(null);
