From 2cb1fd3bd3dd4da280903201f5026eeeae497e82 Mon Sep 17 00:00:00 2001 From: Suresh Srinivas Date: Thu, 6 Dec 2012 17:09:17 +0000 Subject: [PATCH] HADOOP-9121. InodeTree.java has redundant check for vName while throwing exception. Contributed by Arup Malakar. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1418005 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit a5331eeeadd1f248b6961078303d75d41f241919) (cherry picked from commit fca24fbbaa1f8dd13514084f6cdee6a111b31765) --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/fs/viewfs/InodeTree.java | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 0e3fed1d105..1fe62596eef 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -1115,6 +1115,9 @@ Release 2.7.3 - UNRELEASED HADOOP-8818. Use equals instead == in MD5MD5CRC32FileChecksum and TFileDumper. (Brandon Li via suresh) + HADOOP-9121. InodeTree.java has redundant check for vName while + throwing exception. (Arup Malakar via suresh) + Release 2.7.2 - 2016-01-25 INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java index 632f325b2e7..8c42cdf92bd 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java @@ -118,8 +118,7 @@ abstract class InodeTree { return result; } - INode resolveInternal(final String pathComponent) - throws FileNotFoundException { + INode resolveInternal(final String pathComponent) { return children.get(pathComponent); } @@ -336,8 +335,8 @@ abstract class InodeTree { } if (!gotMountTableEntry) { throw new IOException( - "ViewFs: Cannot initialize: Empty Mount table in config for " + - vName == null ? "viewfs:///" : ("viewfs://" + vName + "/")); + "ViewFs: Cannot initialize: Empty Mount table in config for " + + "viewfs://" + vName + "/"); } }