HADOOP-7057. svn merge -c 1040849 from trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.22@1040850 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 89bb6e9..ece4fea 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -340,6 +340,9 @@
     HADOOP-6496. HttpServer sends wrong content-type for CSS files
     (and others). (Todd Lipcon via tomwhite)
 
+    HADOOP-7057. IOUtils.readFully and IOUtils.skipFully have typo in
+    exception creation's message. (cos)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS
diff --git a/src/java/org/apache/hadoop/io/IOUtils.java b/src/java/org/apache/hadoop/io/IOUtils.java
index aa3450d..f7d27a7 100644
--- a/src/java/org/apache/hadoop/io/IOUtils.java
+++ b/src/java/org/apache/hadoop/io/IOUtils.java
@@ -115,7 +115,7 @@
     while ( toRead > 0 ) {
       int ret = in.read( buf, off, toRead );
       if ( ret < 0 ) {
-        throw new IOException( "Premeture EOF from inputStream");
+        throw new IOException( "Premature EOF from inputStream");
       }
       toRead -= ret;
       off += ret;
@@ -132,7 +132,7 @@
     while ( len > 0 ) {
       long ret = in.skip( len );
       if ( ret < 0 ) {
-        throw new IOException( "Premeture EOF from inputStream");
+        throw new IOException( "Premature EOF from inputStream");
       }
       len -= ret;
     }