Repository: stratos Updated Branches: refs/heads/master e755b3292 -> 60122344f
Fixing default jndi.properties.dir Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/60122344 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/60122344 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/60122344 Branch: refs/heads/master Commit: 60122344f5e6f47cfd31b9234b2cc88c95c29083 Parents: e755b32 Author: Imesh Gunaratne <[email protected]> Authored: Tue Jun 16 18:20:08 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Jun 16 18:20:21 2015 +0530 ---------------------------------------------------------------------- .../stratos/messaging/broker/connect/amqp/AmqpTopicConnector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/60122344/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 448989e..7f2eb2f 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 @@ -50,7 +50,7 @@ public abstract class AmqpTopicConnector implements TopicConnector { String jndiPropFileDir = System.getProperty("jndi.properties.dir"); if(StringUtils.isEmpty(jndiPropFileDir)) { // jndi.properties.dir system property not found, set default - jndiPropFileDir = CarbonUtils.getCarbonHome(); + jndiPropFileDir = CarbonUtils.getCarbonHome() + File.separator + "repository" + File.separator + "conf"; } Properties environment = MessagingUtil.getProperties(jndiPropFileDir + File.separator + "jndi.properties"); environment.put("org.wso2.carbon.context.RequestBaseContext", "true"); // always returns the base context.
