Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1593357 merging from trunk to branch-2 to fix:HADOOP-10581. TestUserGroupInformation#testGetServerSideGroups fails. Contributed by Mit Desai. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593358 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kihwal Lee 2014-05-08 18:04:59 +00:00
parent 0e76ba79d6
commit 559fcdc2a6
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -128,6 +128,10 @@ Release 2.5.0 - UNRELEASED
HADOOP-10517. InputStream is not closed in two methods of JarFinder.
(Ted Yu via cnauroth)
HADOOP-10581. TestUserGroupInformation#testGetServerSideGroups fails
because groups stored in Set and ArrayList are compared.
(Mit Desai via kihwal)
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES

6
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java
View File

@ -17,7 +17,6 @@
package org.apache.hadoop.security;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod;
@ -34,9 +33,8 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.Set;
import static org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_USER_GROUP_METRICS_PERCENTILES_INTERVALS;
import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTH_TO_LOCAL;
@ -206,7 +204,7 @@ public class TestUserGroupInformation {
System.out.println(userName + ":" + line);
Set<String> groups = new LinkedHashSet<String> ();
ArrayList<String> groups = new ArrayList<String> ();
String[] tokens = line.split(Shell.TOKEN_SEPARATOR_REGEX);
for(String s: tokens) {
groups.add(s);