Fixed Python Runner suite. null check should be first case in scala 2.11.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/29cc4d9f Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/29cc4d9f Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/29cc4d9f Branch: refs/heads/scala-2.11-prashant Commit: 29cc4d9f8d441a3fee48856433e5cbc131f1e3a1 Parents: eeed1a6 Author: Prashant Sharma <prashan...@imaginea.com> Authored: Wed Nov 5 15:57:48 2014 +0530 Committer: Prashant Sharma <prashan...@imaginea.com> Committed: Fri Nov 7 11:22:47 2014 +0530 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/deploy/PythonRunner.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/29cc4d9f/core/src/main/scala/org/apache/spark/deploy/PythonRunner.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/deploy/PythonRunner.scala b/core/src/main/scala/org/apache/spark/deploy/PythonRunner.scala index af94b05..039c871 100644 --- a/core/src/main/scala/org/apache/spark/deploy/PythonRunner.scala +++ b/core/src/main/scala/org/apache/spark/deploy/PythonRunner.scala @@ -87,8 +87,8 @@ object PythonRunner { // Strip the URI scheme from the path formattedPath = new URI(formattedPath).getScheme match { - case Utils.windowsDrive(d) if windows => formattedPath case null => formattedPath + case Utils.windowsDrive(d) if windows => formattedPath case _ => new URI(formattedPath).getPath } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org