You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ad...@apache.org on 2014/03/12 19:25:53 UTC

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

Repository: spark
Updated Branches:
  refs/heads/master c8c59b326 -> b5162f442


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

...APREDUCE_APPLICATION_CLASSPATH

Author: Thomas Graves <tg...@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


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

Branch: refs/heads/master
Commit: b5162f4426268fdd3acc592e636b8a59c478db9f
Parents: c8c59b3
Author: Thomas Graves <tg...@apache.org>
Authored: Wed Mar 12 11:25:41 2014 -0700
Committer: Aaron Davidson <aa...@databricks.com>
Committed: Wed Mar 12 11:25:41 2014 -0700

----------------------------------------------------------------------
 .../src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala   | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/b5162f44/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
----------------------------------------------------------------------
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 74de429..74c5e0f 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
     }
   }