Merge pull request Netflix#1014 from mattrjacobs/upgrade-rx-1-1

Upgrade to RxJava 1.1.0
zhoupan · Dec 8, 2015 · f17d579 · f17d579
2 parents 4efd2ec + 5d14bcc
commit f17d579
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/hystrix-core/build.gradle b/hystrix-core/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'me.champeau.gradle.jmh'
 
 dependencies {
     compile 'com.netflix.archaius:archaius-core:0.4.1'
-    compile 'io.reactivex:rxjava:1.0.17'
+    compile 'io.reactivex:rxjava:1.1.0'
     compile 'org.slf4j:slf4j-api:1.7.0'
     testCompile 'junit:junit-dep:4.10'
 }

diff --git a/...-core/src/main/java/com/netflix/hystrix/collapser/CollapsedRequestObservableFunction.java b/...-core/src/main/java/com/netflix/hystrix/collapser/CollapsedRequestObservableFunction.java
@@ -18,7 +18,6 @@
 import rx.Observable.OnSubscribe;
 import rx.Subscriber;
 import rx.subjects.PublishSubject;
-import rx.subjects.Subject;
 
 import com.netflix.hystrix.HystrixCollapser.CollapsedRequest;
 
@@ -47,7 +46,7 @@
 /* package */class CollapsedRequestObservableFunction<T, R> implements CollapsedRequest<T, R>, OnSubscribe<T> {
     private final R argument;
     private AtomicBoolean valueSet = new AtomicBoolean(false);
-    private final Subject<T, T> responseSubject = PublishSubject.create();
+    private final PublishSubject<T> responseSubject = PublishSubject.create();
 
     public CollapsedRequestObservableFunction(R arg) {
         this.argument = arg;