You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ve...@apache.org on 2016/08/05 23:08:09 UTC
[2/2] incubator-ranger git commit: RANGER-1135: Modified InMemory
JAAS configuration to use parent config - if exists
RANGER-1135: Modified InMemory JAAS configuration to use parent config - if exists
Signed-off-by: Velmurugan Periasamy <ve...@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/fa59f97b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/fa59f97b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/fa59f97b
Branch: refs/heads/master
Commit: fa59f97bc30584e015b52473d15ade903563b26c
Parents: baac2ba
Author: sneethiraj <sn...@apache.org>
Authored: Fri Aug 5 13:27:27 2016 -0400
Committer: Velmurugan Periasamy <ve...@apache.org>
Committed: Fri Aug 5 19:07:50 2016 -0400
----------------------------------------------------------------------
.../audit/utils/InMemoryJAASConfiguration.java | 21 ++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/fa59f97b/agents-audit/src/main/java/org/apache/ranger/audit/utils/InMemoryJAASConfiguration.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/utils/InMemoryJAASConfiguration.java b/agents-audit/src/main/java/org/apache/ranger/audit/utils/InMemoryJAASConfiguration.java
index 2e8b768..7f08b8f 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/utils/InMemoryJAASConfiguration.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/utils/InMemoryJAASConfiguration.java
@@ -198,15 +198,16 @@ public final class InMemoryJAASConfiguration extends Configuration {
LOG.trace("==> InMemoryJAASConfiguration.getAppConfigurationEntry( {} )", name);
AppConfigurationEntry[] ret = null;
- List<AppConfigurationEntry> retList = applicationConfigEntryMap.get(name);
- if (retList == null || retList.size() == 0) {
- if (parent != null) {
- ret = parent.getAppConfigurationEntry(name);
- }
- } else {
- int sz = retList.size();
- ret = new AppConfigurationEntry[sz];
- ret = retList.toArray(ret);
+ if (parent != null) {
+ ret = parent.getAppConfigurationEntry(name);
+ }
+ if (ret == null || ret.length == 0) {
+ List<AppConfigurationEntry> retList = applicationConfigEntryMap.get(name);
+ if (retList != null && retList.size() > 0) {
+ int sz = retList.size();
+ ret = new AppConfigurationEntry[sz];
+ ret = retList.toArray(ret);
+ }
}
LOG.trace("<== InMemoryJAASConfiguration.getAppConfigurationEntry( {} ) : {}", name, ArrayUtils.toString(ret));
return ret;
@@ -351,4 +352,4 @@ public final class InMemoryJAASConfiguration extends Configuration {
private static boolean isNumeric(String str) {
return str.matches("-?\\d+(\\.\\d+)?"); //match a number with optional '-' and decimal.
}
-}
\ No newline at end of file
+}