HADOOP-10009. Backport HADOOP-7808 to branch-1: fix NPE in SecurityUtil::setTokenService(). Contributed by Haohui Mai.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1529258 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -145,6 +145,9 @@ Release 1.3.0 - unreleased
     MAPREDUCE-5508. JobTracker memory leak caused by unreleased FileSystem
     objects in JobInProgress#cleanupJob. (Xi Fang via cnauroth)
 
+    HADOOP-10009. Backport HADOOP-7808 to branch-1: fix NPE in 
+    SecurityUtil::setTokenService(). (Haohui Mai via jing9)
+
 Release 1.2.2 - unreleased
 
   INCOMPATIBLE CHANGES

src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestRandomAlgorithm.java

@@ -17,7 +17,8 @@
  */
 package org.apache.hadoop.mapred.gridmix;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,8 +31,6 @@ import java.util.Set;
 
 import org.junit.Test;
 
-import com.sun.tools.javac.code.Attribute.Array;
-
 public class TestRandomAlgorithm {
   private static final int[][] parameters = new int[][] {
     {5, 1, 1}, 

src/core/org/apache/hadoop/security/SecurityUtil.java

@@ -332,7 +332,13 @@ public class SecurityUtil {
    * @param addr the socket for the rpc connection
    */
   public static void setTokenService(Token<?> token, InetSocketAddress addr) {
-    token.setService(buildTokenService(addr));
+    Text service = buildTokenService(addr);
+    if (token != null) {
+      token.setService(service);
+      LOG.info("Acquired token "+token);  // Token#toString() prints service
+    } else {
+      LOG.warn("Failed to get token for service "+service);
+    }
   }
   
   /**

src/test/org/apache/hadoop/security/TestSecurityUtil.java

@@ -16,7 +16,10 @@
  */
 package org.apache.hadoop.security;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -28,6 +31,7 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.security.token.Token;
+import org.apache.hadoop.security.token.TokenIdentifier;
 import org.junit.Test;
 import org.mockito.Mockito;
 
@@ -233,10 +237,11 @@ public class TestSecurityUtil {
     SecurityUtil.setTokenServiceUseIp(useIp);
     String serviceHost = useIp ? ip : host.toLowerCase();
     
-    Token token = new Token();
+    Token<TokenIdentifier> token = new Token<TokenIdentifier>();
     Text service = new Text(serviceHost+":"+port);
     
     assertEquals(service, SecurityUtil.buildTokenService(addr));
+
     SecurityUtil.setTokenService(token, addr);
     assertEquals(service, token.getService());
     
@@ -322,4 +327,11 @@ public class TestSecurityUtil {
     NetUtils.addStaticResolution(staticHost, "255.255.255.255");
     verifyServiceAddr(staticHost, "255.255.255.255");
   }
+  
+  @Test
+  public void testSetTokenServiceWithNoToken() {
+    InetSocketAddress addr = NetUtils.makeSocketAddr("127.0.0.1", 1234);
+    // Test whether setTokenService works when token is null
+    SecurityUtil.setTokenService(null, addr);
+  }
 }