Changes based on Matei's comments

1 files changed, 14 insertions, 14 deletions

diff --git a/core/src/main/scala/spark/RDD.scala b/core/src/main/scala/spark/RDD.scala
index 8e50ea5853..8590d487cc 100644
--- a/core/src/main/scala/spark/RDD.scala
+++ b/core/src/main/scala/spark/RDD.scala
@@ -12,7 +12,6 @@ import scala.collection.mutable.ArrayBuffer
 import scala.collection.Map
 import scala.collection.mutable.HashMap
 import scala.collection.JavaConversions.mapAsScalaMap
-import scala.util.control.Breaks._
 
 import org.apache.hadoop.io.BytesWritable
 import org.apache.hadoop.io.NullWritable
@@ -142,21 +141,22 @@ abstract class RDD[T: ClassManifest](@transient sc: SparkContext) extends Serial
     var firstUserMethod = "<not_found>"
     var firstUserFile = "<not_found>"
     var firstUserLine = -1
-
-    breakable {
-      for (el <- trace) {
-        if (el.getClassName().contains("spark") && !el.getClassName().contains("spark.examples")) {
-          lastSparkMethod = el.getMethodName()
-        }
-        else {
-          firstUserMethod = el.getMethodName()
-          firstUserLine = el.getLineNumber()
-          firstUserFile = el.getFileName()
-          break
-        }
+    var finished = false
+    
+    for (el <- trace) {
+      if (!finished) {
+	    if (el.getClassName().contains("spark") && !el.getClassName().startsWith("spark.examples")) {
+	      lastSparkMethod = el.getMethodName()
+	    }
+	    else {
+	      firstUserMethod = el.getMethodName()
+	      firstUserLine = el.getLineNumber()
+	      firstUserFile = el.getFileName()
+	      finished = true
+	    }
       }
     }
-    "%s called in %s (%s:%s)".format(lastSparkMethod, firstUserMethod, firstUserFile, firstUserLine)
+    "%s at: %s (%s:%s)".format(lastSparkMethod, firstUserMethod, firstUserFile, firstUserLine)
   }
   
   // Transformations (return a new RDD)