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 jg...@apache.org on 2015/05/21 23:49:16 UTC

hadoop git commit: HADOOP-12016. Typo in FileSystem::listStatusIterator. Contributed by Arthur Vigil.

Repository: hadoop
Updated Branches:
  refs/heads/trunk 451376186 -> 4fc942a84


HADOOP-12016. Typo in FileSystem::listStatusIterator. Contributed by Arthur Vigil.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4fc942a8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4fc942a8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4fc942a8

Branch: refs/heads/trunk
Commit: 4fc942a84f492065bacfa30cf8b624dc6a5f062b
Parents: 4513761
Author: Jakob Homan <jg...@gmail.com>
Authored: Thu May 21 14:50:03 2015 -0700
Committer: Jakob Homan <jg...@gmail.com>
Committed: Thu May 21 14:50:03 2015 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt                   | 3 +++
 .../src/main/java/org/apache/hadoop/fs/FileSystem.java            | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/4fc942a8/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 aff9368..32f0630 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -218,6 +218,9 @@ Trunk (Unreleased)
     HADOOP-10993. Dump java command line to *.out file
     (Kengo Seki via vinayakumarb)
 
+    HADOOP-12016. Typo in FileSystem::listStatusIterator 
+    (Arthur Vigil via jghoman)
+
   BUG FIXES
 
     HADOOP-11473. test-patch says "-1 overall" even when all checks are +1

http://git-wip-us.apache.org/repos/asf/hadoop/blob/4fc942a8/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
index 33d7c88..01d4b27 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
@@ -1720,7 +1720,7 @@ public abstract class FileSystem extends Configured implements Closeable {
       @Override
       public LocatedFileStatus next() throws IOException {
         if (!hasNext()) {
-          throw new NoSuchElementException("No more entry in " + f);
+          throw new NoSuchElementException("No more entries in " + f);
         }
         FileStatus result = stats[i++];
         BlockLocation[] locs = result.isFile() ?