Handling getCartridgeForValidate exceptions properly
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a6f62512 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a6f62512 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a6f62512 Branch: refs/heads/master Commit: a6f62512d7fb9dbf42c75073d65b1b7835779320 Parents: 6997876 Author: Lahiru Sandaruwan <[email protected]> Authored: Fri Jun 19 15:37:27 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Fri Jun 19 17:26:05 2015 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/rest/endpoint/api/StratosApiV41.java | 7 ++++++- .../apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 5 ++--- 2 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/a6f62512/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 053a1e1..89af1a4 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 @@ -276,7 +276,12 @@ public class StratosApiV41 extends AbstractApi { CartridgeBean cartridgeDefinitionBean) throws RestAPIException { String cartridgeType = cartridgeDefinitionBean.getType(); - CartridgeBean cartridgeBean = StratosApiV41Utils.getCartridgeForValidate(cartridgeType); + CartridgeBean cartridgeBean = null; + try { + cartridgeBean = StratosApiV41Utils.getCartridgeForValidate(cartridgeType); + } catch (CloudControllerServiceCartridgeNotFoundExceptionException ignore) { + //Ignore this since this is valid(cartridge is does not exist) when adding the cartridge for first time + } if (cartridgeBean != null) { String msg = String.format("Cartridge already exists: [cartridge-type] %s", cartridgeType); log.warn(msg); http://git-wip-us.apache.org/repos/asf/stratos/blob/a6f62512/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 41a6fd7..72ad2b1 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 @@ -500,15 +500,14 @@ public class StratosApiV41Utils { * @return CartridgeBean * @throws RestAPIException */ - public static CartridgeBean getCartridgeForValidate(String cartridgeType) throws RestAPIException { + public static CartridgeBean getCartridgeForValidate(String cartridgeType) throws RestAPIException, + CloudControllerServiceCartridgeNotFoundExceptionException { try { Cartridge cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridge(cartridgeType); if (cartridgeInfo == null) { return null; } return ObjectConverter.convertCartridgeToCartridgeDefinitionBean(cartridgeInfo); - } catch (CloudControllerServiceCartridgeNotFoundExceptionException e) { - return null; } catch (RemoteException e) { String message = e.getMessage(); log.error(message, e);
