Skip to content

Commit

Permalink
adding more details about how the toObservable behaves.
Browse files Browse the repository at this point in the history
  • Loading branch information
abersnaze committed Jan 30, 2013
1 parent b276ae1 commit 38ad57c
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions rxjava-core/src/main/java/rx/observables/Observable.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.Map;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

import org.junit.Before;
import org.junit.Test;
Expand Down Expand Up @@ -1406,6 +1407,7 @@ public static <T> Observable<T> toObservable(Iterable<T> iterable) {
*
* Any object that supports the {@link Future} interface can be converted into a Observable that emits
* the return value of the get() method in the object, by passing the object into the <code>toObservable</code> method.
* The subscribe method on this synchronously so the Subscription returned doesn't nothing.
*
* @param future
* the source {@link Future}
Expand All @@ -1423,6 +1425,8 @@ public static <T> Observable<T> toObservable(Future<T> future) {
*
* Any object that supports the {@link Future} interface can be converted into a Observable that emits
* the return value of the get() method in the object, by passing the object into the <code>toObservable</code> method.
* The subscribe method on this synchronously so the Subscription returned doesn't nothing.
* If the future timesout the {@link TimeoutException} exception is passed to the onError.
*
* @param future
* the source {@link Future}
Expand Down

0 comments on commit 38ad57c

Please sign in to comment.