diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-02-24 17:22:22 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-02-24 17:22:22 -0800 |
| commit | 092690e7bf71bb22e6e57afb7ea7f67fdfe31a0a (patch) | |
| tree | 8743138e4b8e46854908e1c38f7fee0bed550709 /src | |
| parent | dff479907919f59f35c4efa75e46950d8a239b5b (diff) | |
| parent | ce68a973834804113ece6e6e2aa39e9825576b97 (diff) | |
| download | scala-2.11.6.tar.gz scala-2.11.6.tar.bz2 scala-2.11.6.zip | |
Merge pull request #4357 from retronym/merge/2.10.x-to-2.11.x-20150224v2.11.6
Merge 2.10.x to 2.11.x
Diffstat (limited to 'src')
| -rw-r--r-- | src/library/scala/concurrent/Promise.scala | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/library/scala/concurrent/Promise.scala b/src/library/scala/concurrent/Promise.scala index eb8044ed3b..0f4e98db57 100644 --- a/src/library/scala/concurrent/Promise.scala +++ b/src/library/scala/concurrent/Promise.scala @@ -66,10 +66,7 @@ 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. * |