- Make sure to close the port if a packages file was passed on the

runtime/bin/builtin.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.
 
 library builtin;
 // NOTE: Do not import 'dart:io' in builtin.
 import 'dart:async';
 import 'dart:collection';
 import 'dart:_internal';
 import 'dart:isolate';
@@ skipping 291 matching lines @@
   _rootScript = scriptUri;
 
   if (_traceLoading) {
     _log('Resolved entry point to: $_rootScript');
   }
   return scriptUri;
 }
 
 
 void _finishLoadRequest(_LoadRequest req) {
-  // Now that we are done with loading remove the request from the map.
-  var tmp = _reqMap.remove(req._id);
-  assert(tmp == req);
-  if (_traceLoading) {
-    _log("Loading of ${req._uri} finished: "
-         "${_reqMap.length} requests remaining, "
-         "${_pendingPackageLoads.length} packages pending.");
+  if (req != null) {
+    // Now that we are done with loading remove the request from the map.
+    var tmp = _reqMap.remove(req._id);
+    assert(tmp == req);
+    if (_traceLoading) {
+      _log("Loading of ${req._uri} finished: "
+           "${_reqMap.length} requests remaining, "
+           "${_pendingPackageLoads.length} packages pending.");
+    }
   }
 
   if (!_pendingLoads()) {
     if (_traceLoading) {
       _log("Closing loading port.");
     }
     _receivePort.close();
     _receivePort = null;
     _sendPort = null;
     _reqId = 0;
@@ skipping 111 matching lines @@
       _loadPackage(req._tag, req._uri, req._resourceUri, req._context);
     } else {
       if (_traceLoading) {
         _log("Skipping dummy deferred request.");
       }
     }
   }
   // Reset the pending package loads to empty. So that we eventually can
   // finish loading.
   _pendingPackageLoads = [];
+  // Make sure that the receive port is closed if no other loads are pending.
+  _finishLoadRequest(null);
 }
 
 
 void _requestPackagesMap() {
   assert(_packagesPort == null);
   assert(_rootScript != null);
   // Create a port to receive the packages map on.
   _packagesPort = new RawReceivePort(_handlePackagesReply);
   var sp = _packagesPort.sendPort;
 
@@ skipping 292 matching lines @@
 
   return [path, filename, name];
 }
 
 
 // Register callbacks and hooks with the rest of the core libraries.
 _setupHooks() {
   _setupCompleted = true;
   VMLibraryHooks.resourceReadAsBytes = _resourceReadAsBytes;
 }