Adding another check to make sure context is the same.

4 years ago · 9d01028bd0
1 changed files with 2 additions and 2 deletions
--- a/packages/backend-core/src/context/index.js
+++ b/packages/backend-core/src/context/index.js
@ -90,7 +90,7 @@ exports.doInTenant = (tenantId, task) => {
    }
  }
  const using = cls.getFromContext(ContextKeys.IN_USE)
-  if (using) {
+  if (using && cls.getFromContext(ContextKeys.TENANT_ID) === tenantId) {
    cls.setOnContext(ContextKeys.IN_USE, using + 1)
    return internal({ existing: true })
  } else {
@ -154,7 +154,7 @@ exports.doInAppContext = (appId, task) => {
    }
  }
  const using = cls.getFromContext(ContextKeys.IN_USE)
-  if (using) {
+  if (using && cls.getFromContext(ContextKeys.APP_ID) === appId) {
    cls.setOnContext(ContextKeys.IN_USE, using + 1)
    return internal({ existing: true })
  } else {