diff options
| author | Reynold Xin <rxin@apache.org> | 2013-10-11 15:58:14 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2013-10-11 15:58:14 -0700 |
| commit | a61cf40ab97e3be467d2e6e50ffb78c9fa8a503b (patch) | |
| tree | 0f6f2abe487ba6a8aa963589672a8df880734bf3 /core/src/main/scala/org/apache/spark/FutureAction.scala | |
| parent | e2047d3927e0032cc1d6de3fd09d00f96ce837d0 (diff) | |
| download | spark-a61cf40ab97e3be467d2e6e50ffb78c9fa8a503b.tar.gz spark-a61cf40ab97e3be467d2e6e50ffb78c9fa8a503b.tar.bz2 spark-a61cf40ab97e3be467d2e6e50ffb78c9fa8a503b.zip | |
Job cancellation: addressed code review feedback from Kay.
Diffstat (limited to 'core/src/main/scala/org/apache/spark/FutureAction.scala')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/FutureAction.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/scala/org/apache/spark/FutureAction.scala b/core/src/main/scala/org/apache/spark/FutureAction.scala index eab2957632..9185b9529c 100644 --- a/core/src/main/scala/org/apache/spark/FutureAction.scala +++ b/core/src/main/scala/org/apache/spark/FutureAction.scala @@ -46,7 +46,7 @@ trait FutureAction[T] extends Future[T] { override def ready(atMost: Duration)(implicit permit: CanAwait): FutureAction.this.type /** - * Await and return the result (of type T) of this action. + * Awaits and returns the result (of type T) of this action. * @param atMost maximum wait time, which may be negative (no waiting is done), Duration.Inf * for unbounded waiting, or a finite positive duration * @throws Exception exception during action execution @@ -76,7 +76,7 @@ trait FutureAction[T] extends Future[T] { override def value: Option[Try[T]] /** - * Block and return the result of this job. + * Blocks and returns the result of this job. */ @throws(classOf[Exception]) def get(): T = Await.result(this, Duration.Inf) |