Updated Branches: refs/heads/4.1 0afc2d003 -> bf40ab48f
CLOUDSTACK-1473: cleanp flag is optional param for deleteDomain API. Check for null before converting it to string Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/bf40ab48 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/bf40ab48 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/bf40ab48 Branch: refs/heads/4.1 Commit: bf40ab48f2af9368b391995ffde2f9e0a3877b48 Parents: 0afc2d0 Author: Kishan Kavala <[email protected]> Authored: Tue Mar 5 17:19:03 2013 +0530 Committer: Chip Childers <[email protected]> Committed: Tue Mar 5 12:59:04 2013 -0500 ---------------------------------------------------------------------- .../cloudstack/region/RegionManagerImpl.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bf40ab48/server/src/org/apache/cloudstack/region/RegionManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/org/apache/cloudstack/region/RegionManagerImpl.java b/server/src/org/apache/cloudstack/region/RegionManagerImpl.java index b4b55fd..fc37d87 100755 --- a/server/src/org/apache/cloudstack/region/RegionManagerImpl.java +++ b/server/src/org/apache/cloudstack/region/RegionManagerImpl.java @@ -460,7 +460,9 @@ public class RegionManagerImpl extends ManagerBase implements RegionManager, Man String command = "deleteDomain"; List<NameValuePair> params = new ArrayList<NameValuePair>(); params.add(new NameValuePair(ApiConstants.ID, domainUUID)); - params.add(new NameValuePair(ApiConstants.CLEANUP, cleanup.toString())); + if(cleanup != null){ + params.add(new NameValuePair(ApiConstants.CLEANUP, cleanup.toString())); + } int regionId = domain.getRegionId(); if(getId() == regionId){
