Repository: spark Updated Branches: refs/heads/branch-1.0 0aaa2c6d0 -> 48cc9a965
SPARK-1734: spark-submit throws an exception: Exception in thread "main"... ... java.lang.ClassNotFoundException: org.apache.spark.broadcast.TorrentBroadcastFactory Author: witgo <[email protected]> Closes #665 from witgo/SPARK-1734 and squashes the following commits: cacf238 [witgo] SPARK-1734: spark-submit throws an exception: Exception in thread "main" java.lang.ClassNotFoundException: org.apache.spark.broadcast.TorrentBroadcastFactory (cherry picked from commit ec09acdd4a72333e1c9c2e9d8e12e9c4c07770c8) Signed-off-by: Patrick Wendell <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/48cc9a96 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/48cc9a96 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/48cc9a96 Branch: refs/heads/branch-1.0 Commit: 48cc9a965af8327fbad310e0864bbbd8c7d3d7cf Parents: 0aaa2c6 Author: witgo <[email protected]> Authored: Tue May 6 14:17:39 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Tue May 6 14:17:53 2014 -0700 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/48cc9a96/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala index 45defb9..7031cdd 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala @@ -333,6 +333,6 @@ object SparkSubmitArguments { val message = s"Failed when loading Spark properties file ${file.getName}" throw new SparkException(message, e) } - properties.stringPropertyNames().toSeq.map(k => (k, properties(k))) + properties.stringPropertyNames().toSeq.map(k => (k, properties(k).trim)) } }
