diff options
| author | Koushik Dutta <koushd@gmail.com> | 2014-07-24 00:47:42 -0700 |
|---|---|---|
| committer | Koushik Dutta <koushd@gmail.com> | 2014-07-24 00:47:42 -0700 |
| commit | 5939809b83993b14a5ec46cec21e0f8fa9837a1f (patch) | |
| tree | aa77a1ad5ff9c96e192f9d70569b424a244e6ac0 /AndroidAsync | |
| parent | 86fb8a6e63afd2212d017c84e19358baf83205ea (diff) | |
| parent | c866d2bffa839b92c90bb389227fbe12b7883a7c (diff) | |
| download | AndroidAsync-5939809b83993b14a5ec46cec21e0f8fa9837a1f.tar.gz AndroidAsync-5939809b83993b14a5ec46cec21e0f8fa9837a1f.tar.bz2 AndroidAsync-5939809b83993b14a5ec46cec21e0f8fa9837a1f.zip | |
Merge branch 'master' into spdy
Conflicts:
AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java
Diffstat (limited to 'AndroidAsync')
| -rw-r--r-- | AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java b/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java index 4ddc3f2..c4f4d81 100644 --- a/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java +++ b/AndroidAsync/src/com/koushikdutta/async/BufferedDataEmitter.java @@ -38,7 +38,7 @@ public class BufferedDataEmitter implements DataEmitter { if (mDataCallback != null && !isPaused() && mBuffers.remaining() > 0) mDataCallback.onDataAvailable(this, mBuffers); - if (mEnded && mBuffers.remaining() == 0) + if (mEnded && !mBuffers.hasRemaining() && mEndCallback != null) mEndCallback.onCompleted(mEndException); } |