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 2015/04/16 06:04:34 UTC
[1/4] stratos git commit: fix amqp too many open files issue
Repository: stratos
Updated Branches:
refs/heads/master 7b09bc153 -> f3e322545
fix amqp too many open files issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f3e32254
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f3e32254
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f3e32254
Branch: refs/heads/master
Commit: f3e3225453a38b7edf29b5f7d46409c52ce8314a
Parents: dbdc993
Author: Udara Liyanage <ud...@wso2.com>
Authored: Thu Apr 16 08:32:44 2015 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Apr 16 09:33:45 2015 +0530
----------------------------------------------------------------------
.../broker/connect/amqp/AmqpTopicConnector.java | 1 +
.../broker/connect/amqp/AmqpTopicPublisher.java | 23 ++++++++++++++++++--
.../broker/publish/EventPublisher.java | 2 ++
3 files changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f3e32254/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/amqp/AmqpTopicConnector.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/amqp/AmqpTopicConnector.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/amqp/AmqpTopicConnector.java
index 381a733..7d347ca 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/amqp/AmqpTopicConnector.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/amqp/AmqpTopicConnector.java
@@ -88,6 +88,7 @@ public abstract class AmqpTopicConnector implements TopicConnector {
if (topicConnection != null) {
try {
topicConnection.stop();
+ topicConnection.close();
} catch (JMSException ignore) {
log.warn("Could not disconnect from message broker");
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f3e32254/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/amqp/AmqpTopicPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/amqp/AmqpTopicPublisher.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/amqp/AmqpTopicPublisher.java
index ea2f314..3f75096 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/amqp/AmqpTopicPublisher.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/amqp/AmqpTopicPublisher.java
@@ -25,6 +25,7 @@ import org.apache.stratos.messaging.broker.connect.RetryTimer;
import org.apache.stratos.messaging.broker.connect.TopicPublisher;
import org.apache.stratos.messaging.domain.exception.MessagingException;
+import javax.jms.JMSException;
import javax.jms.TextMessage;
import javax.jms.Topic;
import javax.jms.TopicSession;
@@ -57,6 +58,8 @@ public class AmqpTopicPublisher extends AmqpTopicConnector implements TopicPubli
public void publish(String message, boolean retry) {
boolean published = false;
while (!published) {
+ TopicSession topicSession = null;
+ javax.jms.TopicPublisher topicPublisher = null;
try {
while (connectionStatus == ConnectionStatus.ReConnecting) {
// Connection has been broken, wait until reconnected
@@ -73,13 +76,13 @@ public class AmqpTopicPublisher extends AmqpTopicConnector implements TopicPubli
connectionStatus = ConnectionStatus.Connected;
}
- TopicSession topicSession = newSession();
+ topicSession = newSession();
Topic topic = lookupTopic(topicName);
if (topic == null) {
// if the topic doesn't exist, create it.
topic = topicSession.createTopic(topicName);
}
- javax.jms.TopicPublisher topicPublisher = topicSession.createPublisher(topic);
+ topicPublisher = topicSession.createPublisher(topic);
TextMessage textMessage = topicSession.createTextMessage(message);
topicPublisher.publish(textMessage);
published = true;
@@ -92,6 +95,22 @@ public class AmqpTopicPublisher extends AmqpTopicConnector implements TopicPubli
}
// Try to reconnect
reconnect();
+ }finally {
+
+ try{
+ if (topicSession != null) {
+ topicSession.close();
+ }
+ if (topicPublisher != null) {
+ topicPublisher.close();
+ }
+
+ }catch (JMSException e) {
+ message = "Error cleaning up pubisher";
+ log.error(message, e);
+ throw new MessagingException(message, e);
+ }
+
}
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f3e32254/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/publish/EventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/publish/EventPublisher.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/publish/EventPublisher.java
index 8d21496..b488b23 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/publish/EventPublisher.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/publish/EventPublisher.java
@@ -70,6 +70,8 @@ public class EventPublisher {
topicPublisher.connect();
topicPublisher.publish(message, retry);
+ topicPublisher.disconnect();
+
}
}
}
[2/4] stratos git commit: remove unused exception class
TerminationException.java
Posted by ud...@apache.org.
remove unused exception class TerminationException.java
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c39653f4
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c39653f4
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c39653f4
Branch: refs/heads/master
Commit: c39653f47d2dc8110ffb51593eface54daec996f
Parents: d86b9cb
Author: Udara Liyanage <ud...@wso2.com>
Authored: Sun Apr 12 08:48:45 2015 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Apr 16 09:33:45 2015 +0530
----------------------------------------------------------------------
.../cartridge/TerminationException.java | 45 --------------------
1 file changed, 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c39653f4/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/cartridge/TerminationException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/cartridge/TerminationException.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/cartridge/TerminationException.java
deleted file mode 100644
index 18f80ba..0000000
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/cartridge/TerminationException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.apache.stratos.autoscaler.exception.cartridge;
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-
-public class TerminationException extends Throwable {
-
- private static final long serialVersionUID = -6038793010380236971L;
- private String message;
-
- public TerminationException(String s, Exception e) {
- super(s, e);
- this.setMessage(s);
- }
-
- public TerminationException(Exception e) {
- super(e);
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-}
[3/4] stratos git commit: replace new Integer with Integer.valueOf
Posted by ud...@apache.org.
replace new Integer with Integer.valueOf
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dbdc9933
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dbdc9933
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dbdc9933
Branch: refs/heads/master
Commit: dbdc99330fb55d0c73183db60552aaf7c759fa7e
Parents: c39653f
Author: Udara Liyanage <ud...@wso2.com>
Authored: Sun Apr 12 14:06:59 2015 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Apr 16 09:33:45 2015 +0530
----------------------------------------------------------------------
.../apache/stratos/common/client/AutoscalerServiceClient.java | 4 ++--
.../stratos/common/client/CloudControllerServiceClient.java | 2 +-
.../stratos/common/client/StratosManagerServiceClient.java | 4 ++--
.../org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java | 3 +--
.../org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 1 +
5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/dbdc9933/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
index 88665c3..3949bec 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
@@ -53,9 +53,9 @@ public class AutoscalerServiceClient {
try {
stub = new AutoscalerServiceStub(epr);
stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,
- new Integer(autosclaerSocketTimeout));
+ Integer.valueOf(autosclaerSocketTimeout));
stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,
- new Integer(autosclaerConnectionTimeout));
+ Integer.valueOf(autosclaerConnectionTimeout));
} catch (AxisFault axisFault) {
String msg = "Could not initialize autoscaler service client";
http://git-wip-us.apache.org/repos/asf/stratos/blob/dbdc9933/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
index cb19041..7d226eb 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
@@ -52,7 +52,7 @@ public class CloudControllerServiceClient {
try {
stub = new CloudControllerServiceStub(epr);
- stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, new Integer(ccSocketTimeout));
+ stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, Integer.valueOf(ccSocketTimeout));
stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT, new Integer(ccConnectionTimeout));
} catch (AxisFault axisFault) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/dbdc9933/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java
index add2267..909d52e 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java
@@ -56,8 +56,8 @@ public class StratosManagerServiceClient {
try {
stub = new StratosManagerServiceStub(epr);
- stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, new Integer(ccSocketTimeout));
- stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT, new Integer(ccConnectionTimeout));
+ stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, Integer.valueOf(ccSocketTimeout));
+ stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT, Integer.valueOf(ccConnectionTimeout));
} catch (AxisFault axisFault) {
String msg = "Could not initialize stratos manager service client";
http://git-wip-us.apache.org/repos/asf/stratos/blob/dbdc9933/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
index a067d78..6c83add 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
@@ -362,8 +362,7 @@ public class StratosApiV40Utils {
log.debug("Getting available cartridges. Search String: " + cartridgeSearchString + ", Multi-Tenant: " + multiTenant);
}
- boolean allowMultipleSubscription = new Boolean(
- System.getProperty(CartridgeConstants.FEATURE_MULTI_TENANT_MULTIPLE_SUBSCRIPTION_ENABLED));
+ boolean allowMultipleSubscription = Boolean.valueOf(System.getProperty(CartridgeConstants.FEATURE_MULTI_TENANT_MULTIPLE_SUBSCRIPTION_ENABLED));
try {
Pattern searchPattern = getSearchStringPattern(cartridgeSearchString);
http://git-wip-us.apache.org/repos/asf/stratos/blob/dbdc9933/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 7c81b91..987f147 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
@@ -303,6 +303,7 @@ public class StratosApiV41Utils {
log.debug("Getting available cartridges. [Search String]: " + cartridgeSearchString + ", [Multi-Tenant]: " + multiTenant);
}
+
boolean allowMultipleSubscription = Boolean.valueOf(
System.getProperty(CartridgeConstants.FEATURE_MULTI_TENANT_MULTIPLE_SUBSCRIPTION_ENABLED));
[4/4] stratos git commit: fix equals method
Posted by ud...@apache.org.
fix equals method
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d86b9cba
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d86b9cba
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d86b9cba
Branch: refs/heads/master
Commit: d86b9cba902943d063abe7b2f9788f72104e4ec2
Parents: 7b09bc1
Author: Udara Liyanage <ud...@wso2.com>
Authored: Sun Apr 12 08:24:32 2015 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Apr 16 09:33:45 2015 +0530
----------------------------------------------------------------------
.../stratos/metadata/service/security/StratosPrincipal.java | 8 +++++++-
.../stratos/rest/endpoint/security/StratosPrincipal.java | 7 ++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d86b9cba/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/security/StratosPrincipal.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/security/StratosPrincipal.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/security/StratosPrincipal.java
index 5bd6336..788dc59 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/security/StratosPrincipal.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/security/StratosPrincipal.java
@@ -36,7 +36,13 @@ public class StratosPrincipal implements Principal {
}
public boolean equals(Object another) {
- return userName.equals((another));
+
+ if (another == null || another.getClass() != this.getClass()) {
+ return false;
+ }
+
+ StratosPrincipal principal = (StratosPrincipal) another;
+ return userName.equals((principal.getName()));
}
public String toString() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/d86b9cba/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/security/StratosPrincipal.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/security/StratosPrincipal.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/security/StratosPrincipal.java
index cf538f1..210e128 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/security/StratosPrincipal.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/security/StratosPrincipal.java
@@ -36,7 +36,12 @@ public class StratosPrincipal implements Principal {
}
public boolean equals(Object another) {
- return userName.equals((another));
+ if (another == null || another.getClass() != this.getClass()) {
+ return false;
+ }
+
+ StratosPrincipal principal = (StratosPrincipal) another;
+ return userName.equals((principal.getName()));
}
public String toString() {