Merge upstream into cm-11.0

Change-Id: I304cfea73e62d7a78d4eb1e0a766d6bb1666476f

1 files changed, 1 insertions, 8 deletions

diff --git a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
index 096be5b..ed4f87f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
@@ -36,8 +36,6 @@ public class BufferedDataSink implements DataSink {
             if (mPendingWrites.remaining() == 0) {
                 if (endPending)
                     mDataSink.end();
-                if (closePending)
-                    mDataSink.close();
             }
         }
         if (!mPendingWrites.hasRemaining() && mWritable != null)
@@ -113,16 +111,11 @@ public class BufferedDataSink implements DataSink {
 
     @Override
     public boolean isOpen() {
-        return !closePending && mDataSink.isOpen();
+        return mDataSink.isOpen();
     }
 
-    boolean closePending;
     @Override
     public void close() {
-        if (mPendingWrites.hasRemaining()) {
-            closePending = true;
-            return;
-        }
         mDataSink.close();
     }