killbill-aplcache

catalog: CR to swap cache invalidation to avoid race condition

6/30/2017 8:08:32 PM

stephane brossier

Commit: 6f1e6e2

Tree: 248f916

Parents: 8e09e28

Changes

catalog/src/main/java/org/killbill/billing/catalog/api/user/DefaultCatalogUserApi.java 2(+1 -1)

Details

catalog/src/main/java/org/killbill/billing/catalog/api/user/DefaultCatalogUserApi.java 2(+1 -1)

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/api/user/DefaultCatalogUserApi.java b/catalog/src/main/java/org/killbill/billing/catalog/api/user/DefaultCatalogUserApi.java
index 88eb3d6..245440f 100644
--- a/catalog/src/main/java/org/killbill/billing/catalog/api/user/DefaultCatalogUserApi.java
+++ b/catalog/src/main/java/org/killbill/billing/catalog/api/user/DefaultCatalogUserApi.java
@@ -207,8 +207,8 @@ public class DefaultCatalogUserApi implements CatalogUserApi {
 
         final InternalTenantContext internalTenantContext = internalCallContextFactory.createInternalTenantContextWithoutAccountRecordId(callContext);
         try {
-            catalogCache.clearCatalog(internalTenantContext);
             tenantApi.deleteTenantKey(TenantKey.CATALOG.toString(), callContext);
+            catalogCache.clearCatalog(internalTenantContext);
             createDefaultEmptyCatalog(clock.getUTCNow(), callContext);
         } catch (final TenantApiException e) {
             throw new CatalogApiException(e);