Close a _FileInputStream only immediately before onClosed is called, so .closed returns false befor…

runtime/bin/stream_util.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 class _BaseDataInputStream {
   abstract int available();
 
   List<int> read([int len]) {
-    if (_closeCallbackCalled) return null;
+    if (_closeCallbackCalled || _scheduledCloseCallback != null) return null;
     int bytesToRead = available();
     if (bytesToRead == 0) {
       _checkScheduleCallbacks();
       return null;
     }
     if (len !== null) {
       if (len <= 0) {
         throw new StreamException("Illegal length $len");
       } else if (bytesToRead > len) {
         bytesToRead = len;
       }
     }
     return _read(bytesToRead);
   }
 
   int readInto(List<int> buffer, [int offset = 0, int len]) {
-    if (_closeCallbackCalled) return 0;
+    if (_closeCallbackCalled || _scheduledCloseCallback != null) return 0;
     if (len === null) len = buffer.length;
     if (offset < 0) throw new StreamException("Illegal offset $offset");
     if (len < 0) throw new StreamException("Illegal length $len");
     int bytesToRead = Math.min(len, available());
     return _readInto(buffer, offset, bytesToRead);
   }
 
   void pipe(OutputStream output, [bool close = true]) {
     _pipe(this, output, close: close);
   }
@@ skipping 65 matching lines @@
     void issueDataCallback(Timer timer) {
       _scheduledDataCallback = null;
       if (_clientDataHandler !== null) {
         _clientDataHandler();
         _checkScheduleCallbacks();
       }
     }
 
     void issueCloseCallback(Timer timer) {
       _scheduledCloseCallback = null;
+      _closeCallbackCalled = true;
       if (_clientCloseHandler !== null) _clientCloseHandler();
     }
 
     // Schedule data callback if there is more data to read. Schedule
     // close callback once when all data has been read. Only schedule
     // a new callback if the previous one has actually been called.
     if (!_closeCallbackCalled) {
       if (available() > 0) {
         if (_scheduledDataCallback == null) {
           _scheduledDataCallback = new Timer(0, issueDataCallback);
         }
-      } else if (_streamMarkedClosed && !_closeCallbackCalled) {
+      } else if (_streamMarkedClosed &&
+                 _scheduledCloseCallback == null) {

[Anders Johnsen, 2012/06/14 11:24:07]

Can this be on one line?

[Bill Hesse, 2012/06/14 11:41:00]

Yes.

         _cancelScheduledDataCallback();
         _close();
         _scheduledCloseCallback = new Timer(0, issueCloseCallback);
-        _closeCallbackCalled = true;
       }
     }
   }
 
   // When this is set to true the stream is marked closed. When a
   // stream is marked closed no more data can arrive and the value
   // from available is now all remaining data. If this is true and the
   // value of available is zero the close handler is called.
   bool _streamMarkedClosed = false;
 
@@ skipping 64 matching lines @@
   void _reportError(e) {
     if (_onError != null) {
       _onError(e);
     } else {
       throw e;
     }
   }
 
   Function _onError;
 }