dont set the brokerURI property based on the naming provider URL property
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/891542aa Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/891542aa Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/891542aa Branch: refs/heads/master Commit: 891542aacfb2d50b2a24350fdb475fcf9f688649 Parents: a2f50a1 Author: Robert Gemmell <[email protected]> Authored: Tue Jan 20 12:53:27 2015 +0000 Committer: Robert Gemmell <[email protected]> Committed: Tue Jan 20 12:53:27 2015 +0000 ---------------------------------------------------------------------- .../qpid/jms/jndi/JmsInitialContextFactory.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/891542aa/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java index 0f4a399..1a2db25 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java @@ -188,15 +188,16 @@ public class JmsInitialContextFactory implements InitialContextFactory { * environment */ protected JmsConnectionFactory createConnectionFactory(Hashtable<Object,Object> environment) throws URISyntaxException { - JmsConnectionFactory answer = new JmsConnectionFactory(); Map<String, String> properties = toMap(environment); + + // Remove naming-related properties which relate to the + // InitialContextFactory implementation itself properties.remove(Context.INITIAL_CONTEXT_FACTORY); - Object o = properties.remove(Context.PROVIDER_URL); - if (o != null) { - answer.setBrokerURI(o.toString()); - } - answer.setProperties(properties); - return answer; + properties.remove(Context.PROVIDER_URL); + + JmsConnectionFactory factory = new JmsConnectionFactory(); + factory.setProperties(properties); + return factory; } public Map<String, String> toMap(Hashtable<Object, Object> props) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
