Fixed bug when creating an enterprise

Ecorification · Nov 28, 2016 · e797590 · e797590
1 parent 38c0ce8
commit e797590
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/...end/src/main/java/org/cocome/cloud/web/connector/enterpriseconnector/EnterpriseQuery.java b/...end/src/main/java/org/cocome/cloud/web/connector/enterpriseconnector/EnterpriseQuery.java
@@ -88,9 +88,7 @@ public void updateEnterpriseInformation() {
 
 	@Override
 	public void updateStoreInformation() throws NotInDatabaseException_Exception {
-		if (this.enterprises == null) {
-			updateEnterpriseInformation();
-		}
+		checkEnterprisesAvailable();
 
 		// This collection has a fixed size depending on the number of
 		// enterprises,
@@ -114,9 +112,7 @@ public void updateStoreInformation() throws NotInDatabaseException_Exception {
 
 	@Override
 	public EnterpriseViewData getEnterpriseByID(long enterpriseID) {
-		if (enterprises == null) {
-			updateEnterpriseInformation();
-		}
+		checkEnterprisesAvailable();
 
 		return enterprises.get(enterpriseID);
 	}
@@ -192,6 +188,8 @@ public boolean updateStore(@NotNull StoreViewData store) {
 
 	@Override
 	public boolean createEnterprise(@NotNull String name) {
+		checkEnterprisesAvailable();
+
 		EnterpriseTO enterpriseTO;
 
 		try {
@@ -201,6 +199,7 @@ public boolean createEnterprise(@NotNull String name) {
 			LOG.error(String.format("Exception while creating enterprise: %s\n%s", e.getMessage(), e.getStackTrace()));
 			return false;
 		}
+
 		enterprises.put(enterpriseTO.getId(), new EnterpriseViewData(enterpriseTO.getId(), enterpriseTO.getName()));
 
 		return true;
@@ -266,4 +265,10 @@ private boolean checkStoresAvailable() {
 		}
 		return true;
 	}
+
+	private void checkEnterprisesAvailable() {
+		if (enterprises == null) {
+			updateEnterpriseInformation();
+		}
+	}
 }