Skip to content

Commit

Permalink
Merge pull request #16 from abersnaze/upgrade-rxjava
Browse files Browse the repository at this point in the history
fixing an error when using rxjava 1.0.12.
  • Loading branch information
abersnaze committed Jun 29, 2015
2 parents 0a2f070 + 4514faa commit 4e1568c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ apply plugin: 'rxjava-project'
apply plugin: 'java'

dependencies {
compile 'io.reactivex:rxjava:1.0.+'
compile 'io.reactivex:rxjava:1.0.12'
compile 'com.google.guava:guava:+'
testCompile 'junit:junit-dep:4.10'
testCompile 'org.mockito:mockito-core:1.8.5'
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/rx/observable/ListenableFutureObservable.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import rx.Observable;
import rx.Observable.OnSubscribe;
import rx.functions.Action0;
import rx.internal.operators.SingleDelayedProducer;
import rx.internal.producers.SingleDelayedProducer;
import rx.Observer;
import rx.Scheduler;
import rx.Scheduler.Worker;
Expand Down Expand Up @@ -76,7 +76,7 @@ public void call(final Subscriber<? super T> subscriber) {
public void run() {
try {
T t = future.get();
sdp.set(t);
sdp.setValue(t);
} catch (Exception e) {
subscriber.onError(e);
}
Expand Down

0 comments on commit 4e1568c

Please sign in to comment.