fix race conditions (systemjs/systemjs#644)

ModuleLoader · Aug 2, 2015 · e36fa26 · e36fa26
1 parent fdb52e8
commit e36fa26
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/loader.js b/src/loader.js
@@ -417,6 +417,9 @@ function logloads(loads) {
   }
   // 15.2.5.2.2
   function addLoadToLinkSet(linkSet, load) {
+    if (load.status == 'failed')
+      return;
+
     console.assert(load.status == 'loading' || load.status == 'loaded', 'loading or loaded on link set');
 
     for (var i = 0, l = linkSet.loads.length; i < l; i++)
@@ -434,6 +437,9 @@ function logloads(loads) {
     var loader = linkSet.loader;
 
     for (var i = 0, l = load.dependencies.length; i < l; i++) {
+      if (!load.dependencies[i])
+        continue;
+
       var name = load.dependencies[i].value;
 
       if (loader.modules[name])