Repository: incubator-ranger Updated Branches: refs/heads/ranger-0.6 cc02a5de7 -> ce120640e
Fixing some potential NPEs Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/7af2a1e2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/7af2a1e2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/7af2a1e2 Branch: refs/heads/ranger-0.6 Commit: 7af2a1e2bed30fbafd9af461af18710781271bc9 Parents: cc02a5d Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Jul 12 15:02:01 2016 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Thu Jul 21 10:47:48 2016 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/ranger/audit/provider/MiscUtil.java | 4 ++++ .../authorization/solr/authorizer/RangerSolrAuthorizer.java | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/7af2a1e2/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java ---------------------------------------------------------------------- diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java index 535894c..ff4dc76 100644 --- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java +++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java @@ -565,6 +565,10 @@ public class MiscUtil { */ static public boolean logErrorMessageByInterval(Log useLogger, String message, Throwable e) { + if (message == null) { + return false; + } + LogHistory log = logHistoryList.get(message); if (log == null) { log = new LogHistory(); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/7af2a1e2/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java ---------------------------------------------------------------------- diff --git a/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java b/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java index a577dcc..d8e24ba 100644 --- a/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java +++ b/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java @@ -355,13 +355,13 @@ public class RangerSolrAuthorizer implements AuthorizationPlugin { String accessType = ACCESS_TYPE_OTHERS; RequestType requestType = context.getRequestType(); - if (requestType.equals(RequestType.ADMIN)) { + if (RequestType.ADMIN.equals(requestType)) { accessType = ACCESS_TYPE_ADMIN; - } else if (requestType.equals(RequestType.READ)) { + } else if (RequestType.READ.equals(requestType)) { accessType = ACCESS_TYPE_QUERY; - } else if (requestType.equals(RequestType.WRITE)) { + } else if (RequestType.WRITE.equals(requestType)) { accessType = ACCESS_TYPE_UPDATE; - } else if (requestType.equals(RequestType.UNKNOWN)) { + } else if (RequestType.UNKNOWN.equals(requestType)) { logger.info("UNKNOWN request type. Mapping it to " + accessType + ". Resource=" + context.getResource()); accessType = ACCESS_TYPE_OTHERS;
