Merge pull request #902 from johanhaleby/master

benjchristensen · benjchristensen · commit 7bb6e33c377d · 2014-02-19T06:59:42.000-08:00
Fixed NullPointerException that may happen on timeout
diff --git a/rxjava-contrib/rxjava-apache-http/src/main/java/rx/apache/http/consumers/ResponseConsumerDelegate.java b/rxjava-contrib/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();
+        }
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,9 @@ protected HttpResponse buildResult(HttpContext context) throws Exception {`
`93`	`93`
`94`	`94`	`@Override`
`95`	`95`	`protected void releaseResources() {`
`96`		`- consumer._releaseResources();`
	`96`	`+ if (consumer != null) {`
	`97`	`+ consumer._releaseResources();`
	`98`	`+ }`
`97`	`99`	`}`
`98`	`100`
`99`	`101`	`}`