Repository: stratos Updated Branches: refs/heads/stratos-4.1.x f78e627b6 -> 81fe08c22
Resolve merge conflicts Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/81fe08c2 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/81fe08c2 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/81fe08c2 Branch: refs/heads/stratos-4.1.x Commit: 81fe08c223840bd6f1b6ea0a73da4c03589a0ad6 Parents: f78e627 Author: Dinithi <[email protected]> Authored: Thu Sep 10 22:22:35 2015 +0530 Committer: Dinithi <[email protected]> Committed: Thu Sep 10 22:22:35 2015 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/81fe08c2/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 47fad4b..81e6872 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 @@ -1908,7 +1908,6 @@ public class StratosApiV41Utils { log.error(message, e); throw new RestAPIException(message, e); } - } catch (RemoteException e) { } catch (RemoteException | AutoscalerServiceApplicationDefinitionExceptionException | AutoscalerServiceRemoteExceptionException | AutoscalerServiceStratosManagerServiceApplicationSignUpExceptionExceptionException e) {
