diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2015-02-15 17:18:09 +0100 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2015-02-15 17:18:09 +0100 |
| commit | ad845ffc2347b289c9ad480de370b50aa4f91d9f (patch) | |
| tree | 2593b1245803952049f49e776b25281debff480e /src | |
| parent | fbbd1b23c99dab32f5f6e05e5f82fd81c7852a37 (diff) | |
| parent | bf20737faa2da5b45ad1ef5e6a43dff307c99788 (diff) | |
| download | scala-ad845ffc2347b289c9ad480de370b50aa4f91d9f.tar.gz scala-ad845ffc2347b289c9ad480de370b50aa4f91d9f.tar.bz2 scala-ad845ffc2347b289c9ad480de370b50aa4f91d9f.zip | |
Merge pull request #4289 from retronym/ticket/8689
SI-8689 Avoid internal error in Promise after sequence of completions
Diffstat (limited to 'src')
| -rw-r--r-- | src/library/scala/concurrent/Promise.scala | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/library/scala/concurrent/Promise.scala b/src/library/scala/concurrent/Promise.scala index 8355a73a1f..02253d4bd9 100644 --- a/src/library/scala/concurrent/Promise.scala +++ b/src/library/scala/concurrent/Promise.scala @@ -66,11 +66,8 @@ trait Promise[T] { * * @return This promise */ - final def completeWith(other: Future[T]): this.type = { - other onComplete { this complete _ } - this - } - + final def completeWith(other: Future[T]): this.type = tryCompleteWith(other) + /** Attempts to complete this promise with the specified future, once that future is completed. * * @return This promise |