Преглед на файлове

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 
    */
   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());
+        }
       }
     }