Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.x: Fixed Javadoc for Disposables.fromFuture #4744

Merged
merged 2 commits into from
Oct 21, 2016
Merged

2.x: Fixed Javadoc for Disposables.fromFuture #4744

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15b1c4d
Fixed Javadoc for Disposables.fromFuture
pruefer90 Oct 21, 2016
07c9a28
Missed a runnable
pruefer90 Oct 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/io/reactivex/disposables/Disposables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ public static Disposable fromFuture(Future<?> future) {
}

/**
* Construct a Disposable by wrapping a Runnable that is
* executed exactly once when the Disposable is disposed.
* @param future the Runnable to wrap
* Construct a Disposable by wrapping a Future that is
* cancelled exactly once when the Disposable is disposed.
* @param future the Future to wrap
* @param allowInterrupt if true, the future cancel happens via Future.cancel(true)
* @return the new Disposable instance
*/
Expand Down