Minor updates to previous patch
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/4e414fd8 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/4e414fd8 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/4e414fd8 Branch: refs/heads/master Commit: 4e414fd89682e08a20ce83698c830be453bd8483 Parents: ed152bc Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Mon Feb 13 12:10:25 2017 +0000 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Mon Feb 13 12:10:25 2017 +0000 ---------------------------------------------------------------------- .../apache/ranger/plugin/audit/RangerDefaultAuditHandler.java | 2 +- .../org/apache/ranger/plugin/client/HadoopConfigHolder.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/4e414fd8/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java b/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java index b2a7a6c..cee46a3 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java @@ -252,6 +252,6 @@ public class RangerDefaultAuditHandler implements RangerAccessResultProcessor { counter = new AtomicInteger(0); } - return UUID + "-" + nextId; + return UUID + "-" + Integer.toString(nextId); } } http://git-wip-us.apache.org/repos/asf/ranger/blob/4e414fd8/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java b/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java index 54039a7..8e79706 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java @@ -294,10 +294,10 @@ public class HadoopConfigHolder { nameRules = prop.getProperty(RANGER_NAME_RULES); authType = prop.getProperty(RANGER_AUTH_TYPE, "simple"); - String hadoopSecurityAuthenticationn = getHadoopSecurityAuthentication(); + String hadoopSecurityAuthentication = getHadoopSecurityAuthentication(); - if ( hadoopSecurityAuthenticationn != null) { - isKerberosAuth = HADOOP_SECURITY_AUTHENTICATION_METHOD.equalsIgnoreCase(hadoopSecurityAuthenticationn); + if ( hadoopSecurityAuthentication != null) { + isKerberosAuth = HADOOP_SECURITY_AUTHENTICATION_METHOD.equalsIgnoreCase(hadoopSecurityAuthentication); } else { isKerberosAuth = (((userName != null) && (userName.indexOf("@") > -1)) || (SecureClientLogin.isKerberosCredentialExists(lookupPrincipal, lookupKeytab)));
