Merge pull request #757 from envisia/master

Updated the RxNetty based version of HystrixMetricsStreamHandler
Netflix · Apr 16, 2015 · 1ebba20 · 1ebba20
2 parents 2d0ce6b + 1b6dd89
commit 1ebba20
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/hystrix-contrib/hystrix-rx-netty-metrics-stream/build.gradle b/hystrix-contrib/hystrix-rx-netty-metrics-stream/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
     compile project(':hystrix-core')
-    compile "com.netflix.rxnetty:rx-netty:0.3.8"
+    compile 'io.reactivex:rxnetty:0.4.7'
     compile 'org.codehaus.jackson:jackson-core-asl:1.9.2'
     compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.2'
     testCompile 'junit:junit-dep:4.10'

diff --git a/...n/java/com/netflix/hystrix/contrib/rxnetty/metricsstream/HystrixMetricsStreamHandler.java b/...n/java/com/netflix/hystrix/contrib/rxnetty/metricsstream/HystrixMetricsStreamHandler.java
@@ -47,6 +47,7 @@
  * (unless the client is shutdown).
  *
  * @author Tomasz Bak
+ * @author Christian Schmitt <c.schmitt@envisia.de>
  */
 public class HystrixMetricsStreamHandler<I, O> implements RequestHandler<I, O> {
 
@@ -89,7 +90,7 @@ private Observable<Void> handleHystrixRequest(final HttpServerResponse<O> respon
                 .subscribe(new Action1<Long>() {
                     @Override
                     public void call(Long tick) {
-                        if (!response.getChannelHandlerContext().channel().isOpen()) {
+                        if (!response.getChannel().isOpen()) {
                             subscription.unsubscribe();
                             return;
                         }