Merge -r 1333743:1333744 from trunk to branch. FIXES: HADOOP-8356

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333745 13f79535-47bb-0310-9956-ffa450edef68

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -158,6 +158,9 @@ Release 2.0.0 - UNRELEASED
     HADOOP-8350. Improve NetUtils.getInputStream to return a stream which has
     a tunable timeout. (todd)
 
+    HADOOP-8356. FileSystem service loading mechanism should print the FileSystem 
+    impl it is failing to load (tucu)
+
   OPTIMIZATIONS
 
   BUG FIXES

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java

@@ -199,7 +199,7 @@ public abstract class FileSystem extends Configured implements Closeable {
    * @return the protocol scheme for the FileSystem.
    */
   public String getScheme() {
-    throw new UnsupportedOperationException("Not implemented by  the FileSystem implementation");
+    throw new UnsupportedOperationException("Not implemented by the " + getClass().getSimpleName() + " FileSystem implementation");
   }
 
   /** Returns a URI whose scheme and authority identify this FileSystem.*/