android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-27 04:22:07 +03:00
Code Releases Activity

Merge pull request #121 from narayank/master

Browse Source 
Fix a null pointer exception in SpdyTransport#makeReusable
This commit is contained in:
Jesse Wilson
2013-02-20 09:08:59 -08:00
parent 65ebcbdea5 36c0a8048a
commit 4b7e0b733f
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java
View File

@@ -81,7 +81,15 @@ public final class SpdyTransport implements Transport {
@Override public boolean makeReusable(boolean streamCancelled, OutputStream requestBodyOut,
InputStream responseBodyIn) {
if (streamCancelled) {
stream.closeLater(SpdyStream.RST_CANCEL);
if (stream != null) {
stream.closeLater(SpdyStream.RST_CANCEL);
return true;
} else {
// If stream is null, it either means that writeRequestHeaders wasn't called
// or that SpdyConnection#newStream threw an IOEXception. In both cases there's
// nothing to do here and this stream can't be reused.
return false;
}
}
return true;
}