If a ControlException propagates to the top of ...

If a ControlException propagates to the top of respond, then retry the
operation.

1 files changed, 11 insertions, 7 deletions

diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala
index 7fac3f7fad..b0b82e5743 100755
--- a/src/compiler/scala/tools/nsc/interactive/Global.scala
+++ b/src/compiler/scala/tools/nsc/interactive/Global.scala
@@ -264,13 +264,17 @@ self =>
 
   // ----------------- Implementations of client commmands -----------------------
 
-  def respond[T](result: Response[T])(op: => T): Unit = try {
-    result set Left(op)
-  } catch {
-    case ex =>
-      result set Right(ex)
-      throw ex
-  }
+  def respond[T](result: Response[T])(op: => T): Unit =
+    while(true)
+      try {
+        result set Left(op)
+        return
+      } catch {
+        case ex : ControlException =>
+        case ex =>
+          result set Right(ex)
+          throw ex
+      }
 
   /** Make sure a set of compilation units is loaded and parsed */
   def reloadSources(sources: List[SourceFile]) {