summaryrefslogtreecommitdiff
path: root/src/library/scala/concurrent/Promise.scala
diff options
context:
space:
mode:
authorAleksandar Prokopec <aleksandar.prokopec@gmail.com>2011-12-06 16:50:36 +0100
committerAleksandar Prokopec <aleksandar.prokopec@gmail.com>2011-12-06 16:50:36 +0100
commit65e3857abce4c84f95aec5f689104d584b6968aa (patch)
tree81aaa1ed93db9b18b8754b16cbf17d32b4512553 /src/library/scala/concurrent/Promise.scala
parent730564354514a9e6d3506f0f1211fa4032cfafc9 (diff)
downloadscala-65e3857abce4c84f95aec5f689104d584b6968aa.tar.gz
scala-65e3857abce4c84f95aec5f689104d584b6968aa.tar.bz2
scala-65e3857abce4c84f95aec5f689104d584b6968aa.zip
Adding some comments to block on. Removing timeout parameters.
Diffstat (limited to 'src/library/scala/concurrent/Promise.scala')
-rw-r--r--src/library/scala/concurrent/Promise.scala5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/library/scala/concurrent/Promise.scala b/src/library/scala/concurrent/Promise.scala
index 4c6b11dfd6..c5336ab00f 100644
--- a/src/library/scala/concurrent/Promise.scala
+++ b/src/library/scala/concurrent/Promise.scala
@@ -16,11 +16,14 @@ package scala.concurrent
* A promise is assigned a timeout when created. After the timeout expires,
* the promise will be failed with a TimeoutException.
*
- * @promiseCompletion
+ * @define promiseCompletion
* If the promise has already been fulfilled, failed or has timed out,
* calling this method will throw an IllegalStateException.
*/
trait Promise[T] {
+
+ /** Future containing the value of this promise.
+ */
def future: Future[T]
/** Completes the promise with a value.