Updated Branches: refs/heads/master 655042e15 -> 8e8a1c99c
Fixing STRATOS-392 Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8e8a1c99 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8e8a1c99 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8e8a1c99 Branch: refs/heads/master Commit: 8e8a1c99c95e0680e0aedd886cb83e6f850b149f Parents: 655042e Author: Melan Nimesh <[email protected]> Authored: Wed Feb 5 20:43:07 2014 +0530 Committer: Isuru <[email protected]> Committed: Wed Feb 5 20:48:19 2014 +0530 ---------------------------------------------------------------------- .../apache/stratos/messaging/broker/connect/TopicConnector.java | 2 ++ .../src/main/java/org/apache/stratos/messaging/util/Constants.java | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8e8a1c99/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/TopicConnector.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/TopicConnector.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/TopicConnector.java index ed262ba..a4fc5c4 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/TopicConnector.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/TopicConnector.java @@ -32,6 +32,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.apache.stratos.messaging.util.Util; +import org.apache.stratos.messaging.util.Constants; /** * This class is responsible for loading the jndi.properties file from the @@ -54,6 +55,7 @@ public class TopicConnector { public void init(String topicName) throws Exception { InitialContext ctx; Properties environment = Util.getProperties(jndiPropFileDir + File.separator + "jndi.properties"); + environment.put(Constants.REQUEST_BASE_CONTEXT, "true"); // always returns the base context. ctx = new InitialContext(environment); // Lookup connection factory String connectionFactoryName = environment.get("connectionfactoryName").toString(); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8e8a1c99/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java index f087d0b..959f6e1 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java @@ -51,4 +51,6 @@ public class Constants { public static final String NO_LOAD_BALANCER = "no.load.balancer"; public static final String EXISTING_LOAD_BALANCERS = "existing.load.balancers"; public static final String LOAD_BALANCED_SERVICE_TYPE = "load.balanced.service.type"; + + public static final String REQUEST_BASE_CONTEXT = "org.wso2.carbon.context.RequestBaseContext"; }
