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:00:53 UTC

[1/2] git commit: Add error message if exception occured when deploying autoscaling policies.

Updated Branches:
  refs/heads/master f803d82df -> ad210e422


Add error message if exception occured when deploying autoscaling policies.


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d1bfb469
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d1bfb469
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d1bfb469

Branch: refs/heads/master
Commit: d1bfb4693145c5f4fd4bb281a6769aff5e9f9f09
Parents: 676d64a
Author: Udara Liyanage <ud...@wso2.com>
Authored: Wed Dec 18 11:29:20 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Dec 18 11:29:20 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/d1bfb469/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 3387e54..2780e55 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
@@ -132,8 +132,9 @@ public class PolicyManager {
             }
             autoscalePolicyListMap.put(asPolicy.getId(), asPolicy);
         } else {
-            throw new InvalidPolicyException("Specified policy [" + asPolicy.getId()
-                    + "] already exists");
+        	String errMsg = "Specified policy [" + asPolicy.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/ad210e42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ad210e42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ad210e42

Branch: refs/heads/master
Commit: ad210e4221ec54ee19772ab091fdfabe69a8c409
Parents: d1bfb46 f803d82
Author: Udara Liyanage <ud...@wso2.com>
Authored: Wed Dec 18 11:30:46 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Dec 18 11:30:46 2013 -0500

----------------------------------------------------------------------
 .../adc/mgt/payload/BasicPayloadData.java       |  4 +-
 .../StratosManagerTopologyReceiver.java         | 15 +++++
 .../cloud/controller/CloudControllerClient.java |  3 +
 .../apache/stratos/cli/DeploymentPolicy.java    | 31 +++++++++
 .../stratos/cli/RestCommandLineService.java     | 68 ++++++++++++++++++++
 .../apache/stratos/cli/StratosApplication.java  |  3 +
 .../cli/commands/AutoscalePolicyCommand.java    |  3 -
 .../cli/commands/DeploymentPolicyCommand.java   | 48 ++++++++++++++
 .../apache/stratos/cli/utils/CliConstants.java  |  9 ++-
 9 files changed, 177 insertions(+), 7 deletions(-)
----------------------------------------------------------------------