Merge pull request #902 from johanhaleby/master

Fixed NullPointerException that may happen on timeout
ReactiveX · Feb 19, 2014 · 7bb6e33 · 7bb6e33
2 parents 1ac89df + d6e78d5
commit 7bb6e33
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...b/rxjava-apache-http/src/main/java/rx/apache/http/consumers/ResponseConsumerDelegate.java b/...b/rxjava-apache-http/src/main/java/rx/apache/http/consumers/ResponseConsumerDelegate.java
@@ -93,7 +93,9 @@ protected HttpResponse buildResult(HttpContext context) throws Exception {
 
     @Override
     protected void releaseResources() {
-        consumer._releaseResources();
+        if (consumer != null) {
+            consumer._releaseResources();
+        }
     }
 
 }