You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2013/12/18 07:33:16 UTC
[1/2] git commit: Add error message when error occured during
deployment policy deploy.
Updated Branches:
refs/heads/master 256cb0a50 -> 924c56fc1
Add error message when error occured during deployment policy deploy.
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/2babfdae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2babfdae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2babfdae
Branch: refs/heads/master
Commit: 2babfdaefa094d1191f922470161714725316bef
Parents: ad210e4
Author: Udara Liyanage <ud...@wso2.com>
Authored: Wed Dec 18 12:02:17 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Dec 18 12:02:17 2013 -0500
----------------------------------------------------------------------
.../org/apache/stratos/autoscaler/policy/PolicyManager.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2babfdae/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
index 2780e55..49e7a2c 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
@@ -184,8 +184,9 @@ public class PolicyManager {
PartitionManager.getInstance().deployNewNetworkPartitions(policy);
deploymentPolicyListMap.put(policy.getId(), policy);
} else {
- throw new InvalidPolicyException("Specified policy [" + policy.getId()
- + "] already exists");
+ String errMsg = "Specified policy [" + policy.getId()+ "] already exists";
+ log.error(errMsg);
+ throw new InvalidPolicyException(errMsg);
}
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ud...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/924c56fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/924c56fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/924c56fc
Branch: refs/heads/master
Commit: 924c56fc13c32d54c8906b478801421904e9d321
Parents: 2babfda 256cb0a
Author: Udara Liyanage <ud...@wso2.com>
Authored: Wed Dec 18 12:03:16 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Dec 18 12:03:16 2013 -0500
----------------------------------------------------------------------
.../adc/mgt/client/AutoscalerServiceClient.java | 13 ++-
.../client/CloudControllerServiceClient.java | 9 +-
.../adc/mgt/utils/CartridgeConstants.java | 5 +
.../autoscaler/api/AutoScalerServiceImpl.java | 2 +-
.../cloud/controller/CloudControllerClient.java | 97 ++++++++++++--------
.../stratos/autoscaler/util/AutoscalerUtil.java | 9 +-
.../distribution/src/main/conf/autoscaler.xml | 1 +
7 files changed, 87 insertions(+), 49 deletions(-)
----------------------------------------------------------------------