From 7483dd857fd352833c91cf7615464890a64f868f Mon Sep 17 00:00:00 2001 From: robvde Date: Mon, 3 Sep 2012 19:10:44 +0400 Subject: [PATCH] If temporary domain is empty within the server configuration, the supplied primary domain will be used as primary domain. This will bypass the creation of the temporary domain. --- .../Code/HostedSolution/OrganizationController.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/OrganizationController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/OrganizationController.cs index 42e42712..824e058a 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/OrganizationController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/OrganizationController.cs @@ -312,11 +312,14 @@ namespace WebsitePanel.EnterpriseServer //create temporary domain name; string domainName = CreateTemporyDomainName(serviceId, organizationId); + if (string.IsNullOrEmpty(domainName)) { - RollbackOrganization(packageId, organizationId); - return BusinessErrorCodes.ERROR_ORGANIZATION_TEMP_DOMAIN_IS_NOT_SPECIFIED; + domainName = organizationName; + //RollbackOrganization(packageId, organizationId); + //return BusinessErrorCodes.ERROR_ORGANIZATION_TEMP_DOMAIN_IS_NOT_SPECIFIED; } + bool domainCreated; int domainId = CreateDomain(domainName, packageId, out domainCreated);