You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2016/08/15 16:55:07 UTC
airavata git commit: Fixed NPE with rabbitmq broker url
Repository: airavata
Updated Branches:
refs/heads/develop 1ecff7642 -> f4aeee534
Fixed NPE with rabbitmq broker url
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f4aeee53
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f4aeee53
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f4aeee53
Branch: refs/heads/develop
Commit: f4aeee53487d72a1229f24218dfe5f785de09c45
Parents: 1ecff76
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Aug 15 12:55:03 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Aug 15 12:55:03 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/common/utils/ServerSettings.java | 4 ++--
.../org/apache/airavata/messaging/core/MessagingFactory.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f4aeee53/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
----------------------------------------------------------------------
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
index 8d52a3d..985daad 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
@@ -123,8 +123,8 @@ public class ServerSettings extends ApplicationSettings {
return getSetting(RABBITMQ_EXPERIMENT_EXCHANGE_NAME, "experiment.launch.queue");
}
- public static String getRabbitmqBrokerUrl() throws ApplicationSettingsException {
- return getSetting(RABBITMQ_BROKER_URL);
+ public static String getRabbitmqBrokerUrl() {
+ return getSetting(RABBITMQ_BROKER_URL, "amqp://localhost:5672");
}
public static String getRabbitmqStatusExchangeName(){
http://git-wip-us.apache.org/repos/asf/airavata/blob/f4aeee53/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/MessagingFactory.java
----------------------------------------------------------------------
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/MessagingFactory.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/MessagingFactory.java
index 573304a..b3e6d35 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/MessagingFactory.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/MessagingFactory.java
@@ -107,7 +107,7 @@ public class MessagingFactory {
private static RabbitMQProperties getProperties() {
return new RabbitMQProperties()
- .setBrokerUrl(ServerSettings.RABBITMQ_BROKER_URL)
+ .setBrokerUrl(ServerSettings.getRabbitmqBrokerUrl())
.setDurable(ServerSettings.getRabbitmqDurableQueue())
.setPrefetchCount(ServerSettings.getRabbitmqPrefetchCount())
.setAutoRecoveryEnable(true)