Merge pull request #3690 from rwjblue/fix-reregistration

[BUGFIX release-1-13] Ensure that `service:store` is cleared before regsitering.
emberjs · Sep 10, 2015 · 8f3200f · 8f3200f
2 parents 8a6afa1 + 7a70e9a
commit 8f3200f
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/packages/ember-data/lib/initializers/store.js b/packages/ember-data/lib/initializers/store.js
@@ -64,8 +64,10 @@ export default function initializeStore(registry, application) {
   }
 
   if (store) {
+    registry.unregister('service:store');
     registry.register('service:store', store, { instantiate: false });
   } else if (!registry.has('service:store')) {
+    registry.unregister('service:store');
     registry.register('service:store', application && application.Store || Store);
   }
 }