fix linking bug systemjs/systemjs#656

guybedford · guybedford · commit c518b8c4d23d · 2015-08-06T21:43:37.000+02:00
diff --git a/src/loader.js b/src/loader.js
@@ -371,13 +371,15 @@ function logloads(loads) {
             proceedToTranslate(loader, existingLoad, Promise.resolve(stepState.moduleSource));
           }
 
-          return existingLoad.linkSets[0].done.then(function() {
-            resolve(existingLoad);
-          });
+          // a primary load -> use that existing linkset
+          if (existingLoad.linkSets.length)
+            return existingLoad.linkSets[0].done.then(function() {
+              resolve(existingLoad);
+            });
         }
       }
 
-      var load = createLoad(name);
+      var load = existingLoad || createLoad(name);
 
       load.metadata = stepState.moduleMetadata;
 

Original file line number	Diff line number	Diff line change
`@@ -371,13 +371,15 @@ function logloads(loads) {`
`371`	`371`	`proceedToTranslate(loader, existingLoad, Promise.resolve(stepState.moduleSource));`
`372`	`372`	`}`
`373`	`373`
`374`		`- return existingLoad.linkSets[0].done.then(function() {`
`375`		`- resolve(existingLoad);`
`376`		`- });`
	`374`	`+ // a primary load -> use that existing linkset`
	`375`	`+ if (existingLoad.linkSets.length)`
	`376`	`+ return existingLoad.linkSets[0].done.then(function() {`
	`377`	`+ resolve(existingLoad);`
	`378`	`+ });`
`377`	`379`	`}`
`378`	`380`	`}`
`379`	`381`
`380`		`- var load = createLoad(name);`
	`382`	`+ var load = existingLoad \|\| createLoad(name);`
`381`	`383`
`382`	`384`	`load.metadata = stepState.moduleMetadata;`
`383`	`385`