Author: cnauroth
Date: Fri Jun 13 16:52:00 2014
New Revision: 1602474
URL: http://svn.apache.org/r1602474
Log:
HADOOP-10678. Merging change r1602473 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1602474&r1=1602473&r2=1602474&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Fri Jun 13 16:52:00 2014
@@ -208,6 +208,9 @@ Release 2.5.0 - UNRELEASED
HADOOP-10686. Writables are not always configured.
(Abraham Elmahrek via kasha)
+ HADOOP-10678. SecurityUtil has unnecessary synchronization on collection
+ used for only tests. (Benoy Antony via cnauroth)
+
BREAKDOWN OF HADOOP-10514 SUBTASKS AND RELATED JIRAS
HADOOP-10520. Extended attributes definition and FileSystem APIs for
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java?rev=1602474&r1=1602473&r2=1602474&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
Fri Jun 13 16:52:00 2014
@@ -289,12 +289,10 @@ public class SecurityUtil {
*/
public static KerberosInfo
getKerberosInfo(Class<?> protocol, Configuration conf) {
- synchronized (testProviders) {
- for(SecurityInfo provider: testProviders) {
- KerberosInfo result = provider.getKerberosInfo(protocol, conf);
- if (result != null) {
- return result;
- }
+ for(SecurityInfo provider: testProviders) {
+ KerberosInfo result = provider.getKerberosInfo(protocol, conf);
+ if (result != null) {
+ return result;
}
}
@@ -317,13 +315,11 @@ public class SecurityUtil {
* @return the TokenInfo or null if it has no KerberosInfo defined
*/
public static TokenInfo getTokenInfo(Class<?> protocol, Configuration conf) {
- synchronized (testProviders) {
- for(SecurityInfo provider: testProviders) {
- TokenInfo result = provider.getTokenInfo(protocol, conf);
- if (result != null) {
- return result;
- }
- }
+ for(SecurityInfo provider: testProviders) {
+ TokenInfo result = provider.getTokenInfo(protocol, conf);
+ if (result != null) {
+ return result;
+ }
}
synchronized (securityInfoProviders) {
