[SPARK-1233] Fix running hadoop 0.23 due to java.lang.NoSuchFieldException: DEFAULT_M...

...APREDUCE_APPLICATION_CLASSPATH

Author: Thomas Graves <tgraves@apache.org>

Closes #129 from tgravescs/SPARK-1233 and squashes the following commits:

85ff5a6 [Thomas Graves] Fix running hadoop 0.23 due to java.lang.NoSuchFieldException: DEFAULT_MAPREDUCE_APPLICATION_CLASSPATH

1 files changed, 2 insertions, 0 deletions

diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
index 74de4293d9..74c5e0f18e 100644
--- a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
+++ b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
@@ -404,6 +404,7 @@ object ClientBase {
       field.get(null).asInstanceOf[Array[String]]
     } catch {
       case err: NoSuchFieldError => null
+      case err: NoSuchFieldException => null
     }
   }
 
@@ -422,6 +423,7 @@ object ClientBase {
       }
     } catch {
       case err: NoSuchFieldError => null
+      case err: NoSuchFieldException => null
     }
   }