You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cm...@apache.org on 2013/08/16 01:10:06 UTC
svn commit: r1514536 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/java/org/apache/hadoop/fs/Globber.java
Author: cmccabe
Date: Thu Aug 15 23:10:06 2013
New Revision: 1514536
URL: http://svn.apache.org/r1514536
Log:
HADOOP-9865. FileContext#globStatus has a regression with respect to relative path. (Contributed by Chaun Lin)
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/fs/Globber.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=1514536&r1=1514535&r2=1514536&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 Thu Aug 15 23:10:06 2013
@@ -53,6 +53,9 @@ Release 2.3.0 - UNRELEASED
HADOOP-9875. TestDoAsEffectiveUser can fail on JDK 7. (Aaron T. Myers via
Colin Patrick McCabe)
+ HADOOP-9865. FileContext#globStatus has a regression with respect to
+ relative path. (Chuan Lin via Colin Patrick McCabe)
+
Release 2.1.1-beta - UNRELEASED
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Globber.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Globber.java?rev=1514536&r1=1514535&r2=1514536&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Globber.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Globber.java Thu Aug 15 23:10:06 2013
@@ -99,24 +99,24 @@ class Globber {
}
private String schemeFromPath(Path path) throws IOException {
- String scheme = pathPattern.toUri().getScheme();
+ String scheme = path.toUri().getScheme();
if (scheme == null) {
if (fs != null) {
scheme = fs.getUri().getScheme();
} else {
- scheme = fc.getFSofPath(path).getUri().getScheme();
+ scheme = fc.getDefaultFileSystem().getUri().getScheme();
}
}
return scheme;
}
private String authorityFromPath(Path path) throws IOException {
- String authority = pathPattern.toUri().getAuthority();
+ String authority = path.toUri().getAuthority();
if (authority == null) {
if (fs != null) {
authority = fs.getUri().getAuthority();
} else {
- authority = fc.getFSofPath(path).getUri().getAuthority();
+ authority = fc.getDefaultFileSystem().getUri().getAuthority();
}
}
return authority ;