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/12 08:42:56 UTC
[1/2] git commit: Avoid new service creation if a service already
exist. Jira-STRATOS-272
Updated Branches:
refs/heads/master 11fadffdd -> 61d41066d
Avoid new service creation if a service already exist. Jira-STRATOS-272
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/472e572c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/472e572c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/472e572c
Branch: refs/heads/master
Commit: 472e572c51bbc18e324408988436064cedabefe9
Parents: 769e0af
Author: Udara Liyanage <ud...@wso2.com>
Authored: Thu Dec 12 13:07:24 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Dec 12 13:07:24 2013 -0500
----------------------------------------------------------------------
.../message/processor/topology/ServiceCreatedMessageProcessor.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/472e572c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java
index 02fb87c..cc2e6cc 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java
@@ -64,6 +64,7 @@ public class ServiceCreatedMessageProcessor extends MessageProcessor {
if (topology.serviceExists(event.getServiceName())) {
if (log.isWarnEnabled()) {
log.warn(String.format("Service already created: [service] %s", event.getServiceName()));
+ return false;
}
}
[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/61d41066
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/61d41066
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/61d41066
Branch: refs/heads/master
Commit: 61d41066d4029f0c639d410b51313ab4a80f97a1
Parents: 472e572 11fadff
Author: Udara Liyanage <ud...@wso2.com>
Authored: Thu Dec 12 13:12:49 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Dec 12 13:12:49 2013 -0500
----------------------------------------------------------------------
.../stratos/autoscaler/LbClusterMonitor.java | 27 +++++++++++++++-----
.../java/org/apache/stratos/cli/RestClient.java | 7 ++++-
.../stratos/cli/RestCommandLineService.java | 5 ++++
.../src/main/conf/jndi.properties | 1 +
.../distribution/src/main/conf/jndi.properties | 2 +-
.../src/main/resources/jndi.properties | 1 +
.../src/main/resources/jndi.properties | 1 +
.../src/main/resources/jndi.properties | 1 +
.../distribution/src/main/conf/jndi.properties | 2 +-
.../stratos-controller/conf/jndi.properties | 2 +-
.../config/as/repository/conf/jndi.properties | 2 +-
.../config/cc/repository/conf/jndi.properties | 2 +-
.../config/cep/repository/conf/jndi.properties | 1 +
.../config/sm/repository/conf/jndi.properties | 2 +-
14 files changed, 43 insertions(+), 13 deletions(-)
----------------------------------------------------------------------