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

HADOOP-10929. Merging change r1616616 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616618 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brandon Li 2014-08-07 22:50:41 +00:00
parent 16c4bd1a96
commit 8a3f21cb08
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,6 +113,9 @@ Release 2.6.0 - UNRELEASED
HADOOP-10931 compile error on tools/hadoop-openstack (xukun via stevel) HADOOP-10931 compile error on tools/hadoop-openstack (xukun via stevel)
HADOOP-10929. Typo in Configuration.getPasswordFromCredentialProviders
(lmccay via brandonli)
Release 2.5.0 - UNRELEASED Release 2.5.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
View File

@ -1775,7 +1775,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
public char[] getPassword(String name) throws IOException { public char[] getPassword(String name) throws IOException {
char[] pass = null; char[] pass = null;
pass = getPasswordFromCredenitalProviders(name); pass = getPasswordFromCredentialProviders(name);
if (pass == null) { if (pass == null) {
pass = getPasswordFromConfig(name); pass = getPasswordFromConfig(name);
@ -1791,7 +1791,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
* @return password or null if not found * @return password or null if not found
* @throws IOException * @throws IOException
*/ */
protected char[] getPasswordFromCredenitalProviders(String name) protected char[] getPasswordFromCredentialProviders(String name)
throws IOException { throws IOException {
char[] pass = null; char[] pass = null;
try { try {