[YARN-11776] Handle NPE in the RMDelegationTokenIdentifier if localSe…

…rviceAddress is null (#7431) Contributed by Abhey Rana. Reviewed-by: Viraj Jasani <[email protected]> Signed-off-by: Shilun Fan <[email protected]>
apache · Mar 6, 2025 · d7a462f · d7a462f
1 parent f0430f2
commit d7a462f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...mon/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenIdentifier.java b/...mon/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenIdentifier.java
@@ -21,6 +21,7 @@
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.net.InetAddress;
 
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceAudience.Public;
@@ -139,9 +140,10 @@ private static ApplicationClientProtocol getRmClient(Token<?> token,
       String[] services = token.getService().toString().split(",");
       for (String service : services) {
         InetSocketAddress addr = NetUtils.createSocketAddr(service);
-        if (localSecretManager != null) {
+        if (localSecretManager != null && localServiceAddress != null) {
           // return null if it's our token
-          if (localServiceAddress.getAddress().isAnyLocalAddress()) {
+          InetAddress localServiceAddr = localServiceAddress.getAddress();
+          if (localServiceAddr != null && localServiceAddr.isAnyLocalAddress()) {
             if (NetUtils.isLocalAddress(addr.getAddress()) &&
                 addr.getPort() == localServiceAddress.getPort()) {
               return null;