From ca9e28dc84f4c721f8b1f25c8739fe7a4ec1ec63 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Wed, 16 Mar 2022 12:25:36 +0530 Subject: [PATCH] api: Fix issue observed with message publish on creation of domain (#6118) * api: Fix issue observed with message publish on creation of domain * add check for successful creation of domain before publishing event --- server/src/main/java/com/cloud/user/DomainManagerImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/com/cloud/user/DomainManagerImpl.java b/server/src/main/java/com/cloud/user/DomainManagerImpl.java index f7aa1078aa3..b1b1976b0d0 100644 --- a/server/src/main/java/com/cloud/user/DomainManagerImpl.java +++ b/server/src/main/java/com/cloud/user/DomainManagerImpl.java @@ -220,11 +220,12 @@ public class DomainManagerImpl extends ManagerBase implements DomainManager, Dom _resourceCountDao.createResourceCounts(domain.getId(), ResourceLimit.ResourceOwnerType.Domain); CallContext.current().putContextParameter(Domain.class, domain.getUuid()); - _messageBus.publish(_name, MESSAGE_ADD_DOMAIN_EVENT, PublishScope.LOCAL, domain.getId()); return domain; } }); - + if (domain != null) { + _messageBus.publish(_name, MESSAGE_ADD_DOMAIN_EVENT, PublishScope.LOCAL, domain.getId()); + } return domain; }