You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/04/09 14:17:37 UTC
[1/2] git commit: avoiding creating new connections to MB always.
this could fix https://issues.apache.org/jira/browse/STRATOS-593 too
Repository: incubator-stratos
Updated Branches:
refs/heads/master 4ae2f2b15 -> 52d9b232c
avoiding creating new connections to MB always. this could fix https://issues.apache.org/jira/browse/STRATOS-593 too
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6f7b2191
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6f7b2191
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6f7b2191
Branch: refs/heads/master
Commit: 6f7b21918e527147ebae37c2756627e963d59847
Parents: 819701d
Author: Nirmal Fernando <ni...@apache.org>
Authored: Wed Apr 9 17:47:09 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Wed Apr 9 17:47:09 2014 +0530
----------------------------------------------------------------------
.../messaging/broker/subscribe/TopicSubscriber.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6f7b2191/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/subscribe/TopicSubscriber.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/subscribe/TopicSubscriber.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/subscribe/TopicSubscriber.java
index f5ba8e9..f6fa587 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/subscribe/TopicSubscriber.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/subscribe/TopicSubscriber.java
@@ -56,10 +56,17 @@ public class TopicSubscriber implements Runnable {
}
private void doSubscribe() throws Exception, JMSException {
- // initialize a TopicConnector
- connector.init(topicName);
- // get a session
- topicSession = connector.newSession();
+ if (topicSession != null && topicSubscriber != null) {
+ return;
+ }
+
+ if (topicSession == null) {
+ // initialize a TopicConnector
+ connector.init(topicName);
+ // get a session
+ topicSession = connector.newSession();
+ }
+
Topic topic = connector.getTopic();
if (topic == null) {
// if topic doesn't exist, create it.
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ni...@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/52d9b232
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/52d9b232
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/52d9b232
Branch: refs/heads/master
Commit: 52d9b232c09417bfcc89247d42c6545bc6294e99
Parents: 6f7b219 4ae2f2b
Author: Nirmal Fernando <ni...@apache.org>
Authored: Wed Apr 9 17:47:15 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Wed Apr 9 17:47:15 2014 +0530
----------------------------------------------------------------------
.../console/controllers/wizardSubmit.jag | 94 +++++++++++---------
.../console/themes/theme1/pages/index.hbs | 2 -
.../partials/configure_stratos_wizard.hbs | 76 ++++++++--------
.../theme1/partials/subscribe_cartridge.hbs | 26 ++++--
.../themes/theme1/partials/tenant_new.hbs | 2 +-
.../console/themes/theme1/ui/js/wizard.js | 37 ++++++--
.../console/util/utility.jag | 3 +
.../stratos/manager/deploy/service/Service.java | 27 ++++--
.../service/ServiceDeploymentManager.java | 10 +++
.../service/multitenant/MultiTenantService.java | 16 ----
.../multitenant/lb/MultiTenantLBService.java | 2 -
.../lb/category/LoadBalancerCategory.java | 1 -
.../ServiceLevelLoadBalancerCategory.java | 3 +-
.../manager/CartridgeSubscriptionManager.java | 8 +-
.../manager/utils/CartridgeConstants.java | 4 +
15 files changed, 187 insertions(+), 124 deletions(-)
----------------------------------------------------------------------