소스 검색

HADOOP-15764. Addendum patch: Fix NPE in SecurityUtil.

Akira Ajisaka 6 년 전
부모
커밋
5c8d90763c
1개의 변경된 파일6개의 추가작업 그리고 4개의 파일을 삭제
  1. 6 4
      hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java

+ 6 - 4
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 
    *       hadoop.security.token.service.use_ip=false 
    */
    */
   protected static class QualifiedHostResolver implements HostResolver {
   protected static class QualifiedHostResolver implements HostResolver {
-    private List<String> searchDomains;
+    private List<String> searchDomains = new ArrayList<>();
     {
     {
       ResolverConfig resolverConfig = ResolverConfig.getCurrentConfig();
       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());
+        }
       }
       }
     }
     }