Repository: ranger Updated Branches: refs/heads/ranger-0.7 991142992 -> 7665dcfd7
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/7665dcfd Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/7665dcfd Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/7665dcfd Branch: refs/heads/ranger-0.7 Commit: 7665dcfd7843e0b999f821fa362de7461aeadf7b Parents: 9911429 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:48:49 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/7665dcfd/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 654a7e9..928398d 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 @@ -291,7 +291,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/7665dcfd/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 4db0ec1..a18a5e0 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");
