Repository: hadoop Updated Branches: refs/heads/branch-2 cc73f2371 -> 4227fff3c
HADOOP-11878. FileContext#fixRelativePart should check for not null for a more informative exception. (Brahma Reddy Battula via kasha) (cherry picked from commit 2e3d83f97b85c015f16f1c162b8ef0e7fee1ddf2) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4227fff3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4227fff3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4227fff3 Branch: refs/heads/branch-2 Commit: 4227fff3c60c6f92c49278b902f5044d2a409a7c Parents: cc73f23 Author: Karthik Kambatla <[email protected]> Authored: Wed Jul 8 11:34:34 2015 -0700 Committer: Karthik Kambatla <[email protected]> Committed: Wed Jul 8 11:35:09 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/fs/FileContext.java | 3 +++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4227fff3/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index c682a66..5695074 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -221,6 +221,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12194. Support for incremental generation in the protoc plugin. (wang) + HADOOP-11878. FileContext#fixRelativePart should check for not null for a + more informative exception. (Brahma Reddy Battula via kasha) + BUG FIXES HADOOP-11802: DomainSocketWatcher thread terminates sometimes after there http://git-wip-us.apache.org/repos/asf/hadoop/blob/4227fff3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java index 321e47f..f6fe054 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java @@ -59,6 +59,8 @@ import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.util.ShutdownHookManager; +import com.google.common.base.Preconditions; + /** * The FileContext class provides an interface to the application writer for * using the Hadoop file system. @@ -272,6 +274,7 @@ public class FileContext { * has been deliberately declared private. */ Path fixRelativePart(Path p) { + Preconditions.checkNotNull(p, "path cannot be null"); if (p.isUriPathAbsolute()) { return p; } else {
