diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Injector.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Injector.js b/src/Injector.js index a9ec6e5d..c24cbb51 100644 --- a/src/Injector.js +++ b/src/Injector.js @@ -273,7 +273,8 @@ function inferInjectionArgs(fn) { function createInjector(modulesToLoad) { - var providerSuffix = 'Provider', + var INSTANTIATING = {}, + providerSuffix = 'Provider', path = [], loadedModules = new HashMap(), providerCache = { @@ -394,10 +395,14 @@ function createInjector(modulesToLoad) { throw Error('Service name expected'); } if (cache.hasOwnProperty(serviceName)) { + if (cache[serviceName] === INSTANTIATING) { + throw Error('Circular dependency: ' + path.join(' <- ')); + } return cache[serviceName]; } else { try { path.unshift(serviceName); + cache[serviceName] = INSTANTIATING; return cache[serviceName] = factory(serviceName); } finally { path.shift(); |