Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

Resolving the wrong response message while activating a non-existing tenant #309

Merged
asfgit merged 9 commits into from
May 13, 2015
Merged

Resolving the wrong response message while activating a non-existing tenant #309

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
605bd70
Changes to the CLI commands
dinithis May 12, 2015
a98b150
Changes to the CLI commands
dinithis May 12, 2015
999842d
Organize imports in RemoveDomainMappingCommand
dinithis May 12, 2015
87ae08d
CLI commands and REST API methods changed
dinithis May 12, 2015
083180f
Improved logs as per the comments
dinithis May 12, 2015
11e974b
Resolving STRATOS-1401
dinithis May 13, 2015
82c2715
Merge branch 'master' of https://github.com/apache/stratos
dinithis May 13, 2015
22a1e87
Resolving the wrong response message while activating a non-existing …
dinithis May 13, 2015
4b0c42c
Merge branch 'master' of https://github.com/apache/stratos
dinithis May 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 21 additions & 18 deletions ....rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3065,30 +3065,33 @@ public static void activateTenant(String tenantDomain) throws RestAPIException {
int tenantId;
try {
tenantId = tenantManager.getTenantId(tenantDomain);
if(tenantId != -1) {
try {
TenantMgtUtil.activateTenant(tenantDomain, tenantManager, tenantId);

} catch (Exception e) {
String msg = "Error in activating Tenant :" + tenantDomain;
log.error(msg, e);
throw new RestAPIException(msg, e);
}

//Notify tenant activation all listeners
try {
TenantMgtUtil.triggerTenantActivation(tenantId);
} catch (StratosException e) {
String msg = "Error in notifying tenant activate.";
log.error(msg, e);
throw new RestAPIException(msg, e);
}
} else {
String msg = "The tenant with domain name: " + tenantDomain + " does not exist.";
throw new RestAPIException(msg);
}
} catch (UserStoreException e) {
String msg = "Error in retrieving the tenant id for the tenant domain: " + tenantDomain + ".";
log.error(msg, e);
throw new RestAPIException(msg, e);
}

try {
TenantMgtUtil.activateTenant(tenantDomain, tenantManager, tenantId);

} catch (Exception e) {
String msg="Error in activating Tenant :"+tenantDomain;
log.error(msg,e);
throw new RestAPIException(msg,e);
}

//Notify tenant activation all listeners
try {
TenantMgtUtil.triggerTenantActivation(tenantId);
} catch (StratosException e) {
String msg = "Error in notifying tenant activate.";
log.error(msg, e);
throw new RestAPIException(msg, e);
}
}

/**
Expand Down