Repository: stratos Updated Branches: refs/heads/master a651a783f -> 26d09fbf1
Fixing issues when adding a cartridge group for non existing cartridges Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/26d09fbf Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/26d09fbf Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/26d09fbf Branch: refs/heads/master Commit: 26d09fbf1fbb8bbf5a1b778375c37e3ee2e526ce Parents: a651a78 Author: Dinithi <[email protected]> Authored: Tue May 19 10:54:56 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Tue May 19 11:34:13 2015 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/rest/endpoint/api/StratosApiV41.java | 3 ++- .../apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/26d09fbf/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index 54340ca..c68ffb3 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -459,7 +459,8 @@ public class StratosApiV41 extends AbstractApi { if (e.getCause().getMessage().contains("already exists")) { return Response.status(Response.Status.CONFLICT).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, "Cartridge group not found")).build(); - } else if (e.getCause().getMessage().contains("Invalid Service Group")) { + } else if (e.getCause().getMessage().contains("Invalid Service Group") || e.getCause().getMessage() + .contains("Required cartridges not found")) { return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, e.getCause().getMessage())).build(); } else { http://git-wip-us.apache.org/repos/asf/stratos/blob/26d09fbf/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index 8c1ee1e..4e90a0b 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@ -29,8 +29,6 @@ import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext; import org.apache.stratos.autoscaler.stub.pojo.ServiceGroup; import org.apache.stratos.cloud.controller.stub.*; import org.apache.stratos.cloud.controller.stub.domain.Cartridge; -import org.apache.stratos.cloud.controller.stub.domain.Persistence; -import org.apache.stratos.cloud.controller.stub.domain.Volume; import org.apache.stratos.common.beans.PropertyBean; import org.apache.stratos.common.beans.TenantInfoBean; import org.apache.stratos.common.beans.UserInfoBean; @@ -971,7 +969,9 @@ public class StratosApiV41Utils { log.error(message, e); throw new RestAPIException(message, e); } catch (CloudControllerServiceCartridgeNotFoundExceptionException e) { - throw new RestAPIException(e); + String message = "Required cartridges not found"; + log.error(message, e); + throw new RestAPIException(message, e); } }
