Fix deferred load errors / bug #26482

runtime/lib/lib_prefix.dart

 // Copyright (c) 2014, 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.
 
 import "dart:async";
 import "dart:isolate";
 
 // This type corresponds to the VM-internal class LibraryPrefix.
 class _LibraryPrefix {
   bool _load() native "LibraryPrefix_load";
@@ skipping 37 matching lines @@
 
 // Called from the VM when an outstanding load request has finished.
 _completeDeferredLoads() {
   // Determine which outstanding load requests have completed and complete
   // their completer (with an error or true). For outstanding load requests
   // which have not completed, remember them for next time in
   // stillOutstandingLoadRequests.
   var stillOutstandingLoadRequests = new List<List>();
   for (int i = 0; i < _outstandingLoadRequests.length; i++) {
     var prefix = _outstandingLoadRequests[i][0];
-    if (prefix._load()) {
-      var completer = _outstandingLoadRequests[i][1];
-      var error = prefix._loadError();
-      if (error != null) {
-        completer.completeError(error);
-      } else {
-        prefix._invalidateDependentCode();
-        completer.complete(true);
-      }
+    var completer = _outstandingLoadRequests[i][1];
+    var error = prefix._loadError();
+    if (error != null) {
+      completer.completeError(error);
+    } else if (prefix._load()) {
+      prefix._invalidateDependentCode();
+      completer.complete(true);
     } else {
       stillOutstandingLoadRequests.add(_outstandingLoadRequests[i]);
     }
   }
   _outstandingLoadRequests = stillOutstandingLoadRequests;
 }