Change FileInputStream to only call onClosed callback when underlying file has been closed. Change…

runtime/bin/file_impl.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 _FileInputStream extends _BaseDataInputStream implements InputStream {
   _FileInputStream(String name)
       : _data = [],
         _position = 0,
         _filePosition = 0 {
     var file = new File(name);
@@ skipping 19 matching lines @@
       _fileLength = len;
       return _fillBuffer();
     });
     chained.handleException((e) {
       _reportError(e);
       return true;
     });
     chained.then((ignored) => _checkScheduleCallbacks());
   }
 
+  void _closeFile() {
+    if (!_openedFile.closed) {
+      _openedFile.close().then((ignore) {
+        _streamMarkedClosed = true;
+        _checkScheduleCallbacks();
+      });
+    }
+  }
+
   Future<int> _fillBuffer() {
     Expect.equals(_position, _data.length);
 
     int size = Math.min(_bufferLength, _fileLength - _filePosition);
     if (size == 0) {
-      _streamMarkedClosed = true;
-      _openedFile.close();
+      _closeFile();
       return new Future.immediate(0);
     }
     if (_data.length != size) {
       _data = new Uint8List(size);
     }
     var future = _openedFile.readList(_data, 0, _data.length);
     future = future.transform((read) {
       _filePosition += read;
       if (read != _data.length) {
         _data.removeRange(read, _data.length - read);
       }
       _position = 0;
 
       if (_fileLength == _filePosition) {
-        _streamMarkedClosed = true;
-        _openedFile.close();
+        _closeFile();
       }
       return read;
     });
     return future;
   }
 
   int available() {
     return closed ? 0 : _data.length - _position;
   }
 
@@ skipping 26 matching lines @@
   }
 
   int _readInto(List<int> buffer, int offset, int len) {
     buffer.setRange(offset, len, _data, _position);
     _position += len;
     _finishRead();
     return len;
   }
 
   void _close() {
-    _streamMarkedClosed = true;
     _data = [];
     _position = 0;
-    if (!_openedFile.closed) {
-      _openedFile.close();
-    }
+    _filePosition = _fileLength;
+    _closeFile();
   }
 
   static final int _bufferLength = 64 * 1024;
 
   RandomAccessFile _openedFile;
   List<int> _data;
   int _position;
   int _filePosition;
   int _fileLength;
 }
@@ skipping 974 matching lines @@
           new FileIOException("File closed '$_name'"));
     });
     return completer.future;
   }
 
   final String _name;
   int _id;
 
   SendPort _fileService;
 }