Fixed race condition in model setup
Change-Id: I698bd00567452a456108b0d65a83c0baa3284f59
diff --git a/src/app/datasources/helpers/model-discoverer.service.ts b/src/app/datasources/helpers/model-discoverer.service.ts
index 434f74e..b1382bd 100644
--- a/src/app/datasources/helpers/model-discoverer.service.ts
+++ b/src/app/datasources/helpers/model-discoverer.service.ts
@@ -220,16 +220,11 @@
private cacheModelEntries(model: IXosModel): ng.IPromise<IXosModel> {
const d = this.$q.defer();
- let populated = false;
const apiUrl = this.getApiUrlFromModel(model);
this.XosModelStore.query(model.name, apiUrl)
.subscribe(
() => {
- // skipping the first response as the observable gets created as an empty array
- if (populated) {
- return d.resolve(model);
- }
- populated = true;
+ return d.resolve(model);
},
err => {
return d.reject(err);