You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2018/09/28 01:04:00 UTC
hadoop git commit: HADOOP-15764. Addendum patch: Fix NPE in
SecurityUtil.
Repository: hadoop
Updated Branches:
refs/heads/trunk 2a5d4315b -> 5c8d90763
HADOOP-15764. Addendum patch: Fix NPE in SecurityUtil.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5c8d9076
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5c8d9076
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5c8d9076
Branch: refs/heads/trunk
Commit: 5c8d90763c52f6bf5224b59738739bd2d1a4b4b8
Parents: 2a5d431
Author: Akira Ajisaka <aa...@apache.org>
Authored: Fri Sep 28 10:02:56 2018 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Fri Sep 28 10:03:22 2018 +0900
----------------------------------------------------------------------
.../java/org/apache/hadoop/security/SecurityUtil.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5c8d9076/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
index 9fea535..2313119 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
@@ -586,12 +586,14 @@ public final class SecurityUtil {
* hadoop.security.token.service.use_ip=false
*/
protected static class QualifiedHostResolver implements HostResolver {
- private List<String> searchDomains;
+ private List<String> searchDomains = new ArrayList<>();
{
ResolverConfig resolverConfig = ResolverConfig.getCurrentConfig();
- searchDomains = new ArrayList<>();
- for (Name name : resolverConfig.searchPath()) {
- searchDomains.add(name.toString());
+ Name[] names = resolverConfig.searchPath();
+ if (names != null) {
+ for (Name name : names) {
+ searchDomains.add(name.toString());
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org