From e0455828e4cbc8242e6d4ad3e470952b9348da06 Mon Sep 17 00:00:00 2001 From: CodingCat Date: Wed, 26 Feb 2014 19:33:16 -0500 Subject: [PATCH 1/4] fix the regression problem on ADD_JARS in 0.9 --- .../scala/org/apache/spark/repl/SparkILoop.scala | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala b/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala index 013cea07d48fd..dbeeb151ff0ab 100644 --- a/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala +++ b/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala @@ -182,10 +182,17 @@ class SparkILoop(in0: Option[BufferedReader], protected val out: JPrintWriter, /** Create a new interpreter. */ def createInterpreter() { - if (addedClasspath != "") - settings.classpath append addedClasspath + if (settings != null) { + if (addedClasspath != "") + settings.classpath append addedClasspath - intp = new SparkILoopInterpreter + // work around for Scala bug + val totalClassPath = SparkILoop.getAddedJars.foldLeft( + settings.classpath.value)((l, r) => ClassPath.join(l, r)) + this.settings.classpath.value = totalClassPath + + intp = new SparkILoopInterpreter + } } /** print a friendly help message */ From ce3667634fe1c23a4ad705d293a437410a7f36af Mon Sep 17 00:00:00 2001 From: CodingCat Date: Wed, 26 Feb 2014 19:58:42 -0500 Subject: [PATCH 2/4] code cleaning --- repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala b/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala index dbeeb151ff0ab..6267de48ceb00 100644 --- a/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala +++ b/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala @@ -183,8 +183,7 @@ class SparkILoop(in0: Option[BufferedReader], protected val out: JPrintWriter, /** Create a new interpreter. */ def createInterpreter() { if (settings != null) { - if (addedClasspath != "") - settings.classpath append addedClasspath + if (addedClasspath != "") settings.classpath append addedClasspath // work around for Scala bug val totalClassPath = SparkILoop.getAddedJars.foldLeft( From 9aa212574c46e4a25dd5d28570fc5f01a9c65c6b Mon Sep 17 00:00:00 2001 From: CodingCat Date: Wed, 26 Feb 2014 20:02:56 -0500 Subject: [PATCH 3/4] code cleaning --- repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala b/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala index 6267de48ceb00..0addecb3d970f 100644 --- a/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala +++ b/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala @@ -183,7 +183,7 @@ class SparkILoop(in0: Option[BufferedReader], protected val out: JPrintWriter, /** Create a new interpreter. */ def createInterpreter() { if (settings != null) { - if (addedClasspath != "") settings.classpath append addedClasspath + if (addedClasspath != "") settings.classpath.append(addedClasspath) // work around for Scala bug val totalClassPath = SparkILoop.getAddedJars.foldLeft( From 8af81e7cf4451b3743b9491585944c6593f1c798 Mon Sep 17 00:00:00 2001 From: CodingCat Date: Wed, 26 Feb 2014 20:06:20 -0500 Subject: [PATCH 4/4] impose non-null settings --- .../scala/org/apache/spark/repl/SparkILoop.scala | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala b/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala index 0addecb3d970f..f52ebe4a159f1 100644 --- a/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala +++ b/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala @@ -182,16 +182,15 @@ class SparkILoop(in0: Option[BufferedReader], protected val out: JPrintWriter, /** Create a new interpreter. */ def createInterpreter() { - if (settings != null) { - if (addedClasspath != "") settings.classpath.append(addedClasspath) + require(settings != null) - // work around for Scala bug - val totalClassPath = SparkILoop.getAddedJars.foldLeft( - settings.classpath.value)((l, r) => ClassPath.join(l, r)) - this.settings.classpath.value = totalClassPath + if (addedClasspath != "") settings.classpath.append(addedClasspath) + // work around for Scala bug + val totalClassPath = SparkILoop.getAddedJars.foldLeft( + settings.classpath.value)((l, r) => ClassPath.join(l, r)) + this.settings.classpath.value = totalClassPath - intp = new SparkILoopInterpreter - } + intp = new SparkILoopInterpreter } /** print a friendly help message */