Merge pull request #2968 from huitseeker/interrupt-kosherness

Follow good interrupt discipline in Response

1 files changed, 8 insertions, 2 deletions

diff --git a/src/interactive/scala/tools/nsc/interactive/Response.scala b/src/interactive/scala/tools/nsc/interactive/Response.scala
index 0da400378e..3e84c83e55 100644
--- a/src/interactive/scala/tools/nsc/interactive/Response.scala
+++ b/src/interactive/scala/tools/nsc/interactive/Response.scala
@@ -55,7 +55,10 @@ class Response[T] {
       try {
         wait()
       } catch {
-        case exc: InterruptedException => raise(exc)
+        case exc: InterruptedException => {
+          Thread.currentThread().interrupt()
+          raise(exc)
+        }
       }
     }
     data.get
@@ -73,7 +76,10 @@ class Response[T] {
       try {
         wait(timeout - (current - start))
       } catch {
-        case exc: InterruptedException => raise(exc)
+        case exc: InterruptedException => {
+          Thread.currentThread().interrupt()
+          raise(exc)
+        }
       }
       current = System.currentTimeMillis
     }