merge HADOOP-7900. LocalDirAllocator confChanged() accesses conf.get() twice. Contributed by Ravi Gummadi.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299443 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uma Maheswara Rao G 2012-03-11 20:38:02 +00:00
parent d27bce1521
commit 4e0d95988f
2 changed files with 4 additions and 1 deletions

View File

@ -92,6 +92,9 @@ Release 0.23.3 - UNRELEASED
BUG FIXES
HADOOP-7900. LocalDirAllocator confChanged() accesses conf.get() twice
(Ravi Gummadi via Uma Maheswara Rao G)
HADOOP-7635. RetryInvocationHandler should release underlying resources on
close. (atm)

View File

@ -253,7 +253,7 @@ public class LocalDirAllocator {
throws IOException {
String newLocalDirs = conf.get(contextCfgItemName);
if (!newLocalDirs.equals(savedLocalDirs)) {
localDirs = conf.getTrimmedStrings(contextCfgItemName);
localDirs = StringUtils.getTrimmedStrings(newLocalDirs);
localFS = FileSystem.getLocal(conf);
int numDirs = localDirs.length;
ArrayList<String> dirs = new ArrayList<String>(numDirs);