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

runtime/bin/stream_util.dart

Index: runtime/bin/stream_util.dart
diff --git a/runtime/bin/stream_util.dart b/runtime/bin/stream_util.dart
index f8856f7af703064a5109b6ab046aaeb418ed69e7..726bc0dc7da7efa827fbca12c6cbd36b8db30cab 100644
--- a/runtime/bin/stream_util.dart
+++ b/runtime/bin/stream_util.dart
@@ -6,7 +6,7 @@ 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();
@@ -23,7 +23,7 @@ class _BaseDataInputStream {
   }
 
   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");
@@ -109,6 +109,7 @@ class _BaseDataInputStream {
 
     void issueCloseCallback(Timer timer) {
       _scheduledCloseCallback = null;
+      _closeCallbackCalled = true;
       if (_clientCloseHandler !== null) _clientCloseHandler();
     }
 
@@ -120,11 +121,11 @@ class _BaseDataInputStream {
         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;
       }
     }
   }