Repository: ranger Updated Branches: refs/heads/master 770f274d0 -> 2a3ada006
RANGER-1530 - NPE in HadoopConfigHolder Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/2a3ada00 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/2a3ada00 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/2a3ada00 Branch: refs/heads/master Commit: 2a3ada00603b17093678a78c4106ca91a4b5a2fd Parents: 770f274 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Thu Apr 20 14:34:22 2017 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Mon Apr 24 10:41:48 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/ranger/plugin/client/HadoopConfigHolder.java | 2 +- .../java/org/apache/ranger/services/hdfs/client/HdfsClient.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/2a3ada00/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 b78930f..fabbdcb 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 @@ -293,7 +293,7 @@ public class HadoopConfigHolder { if (prop != null) { userName = prop.getProperty(RANGER_LOGIN_USER_NAME_PROP); keyTabFile = prop.getProperty(RANGER_LOGIN_KEYTAB_FILE_PROP); - if (!StringUtils.isEmpty(prop.getProperty(ENABLE_HIVE_METASTORE_LOOKUP).trim())) { + if (!StringUtils.isEmpty(prop.getProperty(ENABLE_HIVE_METASTORE_LOOKUP))) { try { enableHiveMetastoreLookup = Boolean.valueOf(prop.getProperty(ENABLE_HIVE_METASTORE_LOOKUP,"false").trim()); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/ranger/blob/2a3ada00/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java ---------------------------------------------------------------------- diff --git a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java index 1d6ad51..cd5c013 100644 --- a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java +++ b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java @@ -53,7 +53,7 @@ public class HdfsClient extends BaseClient { for (Map.Entry<String, String> entry: connectionProperties.entrySet()) { String key = entry.getKey(); String value = entry.getValue(); - if (!rangerInternalPropertyKeys.contains(key)) { + if (!rangerInternalPropertyKeys.contains(key) && value != null) { conf.set(key, value); } } @@ -253,7 +253,7 @@ public class HdfsClient extends BaseClient { String lookupPrincipal=null; try{ lookupPrincipal = SecureClientLogin.getPrincipal(configs.get("lookupprincipal"), java.net.InetAddress.getLocalHost().getCanonicalHostName()); - }catch(Exception e){ + }catch(Exception e){ //do nothing } String lookupKeytab = configs.get("lookupkeytab");
