remove ConnectionFactory method only used by the context factory, do conversion there instead
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/4ddac620 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/4ddac620 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/4ddac620 Branch: refs/heads/master Commit: 4ddac620b29010c8bb1c528972de4b7bea9bf795 Parents: 4f21dbc Author: Robert Gemmell <[email protected]> Authored: Tue Jan 20 10:55:47 2015 +0000 Committer: Robert Gemmell <[email protected]> Committed: Tue Jan 20 10:59:07 2015 +0000 ---------------------------------------------------------------------- .../apache/qpid/jms/JmsConnectionFactory.java | 15 --------------- .../qpid/jms/jndi/JmsInitialContextFactory.java | 19 +++++++++++++------ 2 files changed, 13 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4ddac620/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java index 0f658b1..c5b771f 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java @@ -18,9 +18,7 @@ package org.apache.qpid.jms; import java.net.URI; import java.net.URISyntaxException; -import java.util.HashMap; import java.util.Map; -import java.util.Properties; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -104,19 +102,6 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact setBrokerURI(brokerURI); } - /** - * Set properties - * - * @param props - */ - public void setProperties(Properties props) { - Map<String, String> map = new HashMap<String, String>(); - for (Map.Entry<Object, Object> entry : props.entrySet()) { - map.put(entry.getKey().toString(), entry.getValue().toString()); - } - setProperties(map); - } - @Override public void setProperties(Map<String, String> map) { buildFromProperties(map); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4ddac620/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 29e6bbb..ebd6be1 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 @@ -18,11 +18,11 @@ package org.apache.qpid.jms.jndi; import java.net.URISyntaxException; import java.util.ArrayList; +import java.util.HashMap; import java.util.Hashtable; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.StringTokenizer; import java.util.concurrent.ConcurrentHashMap; @@ -185,16 +185,23 @@ public class JmsInitialContextFactory implements InitialContextFactory { * Factory method to create a new connection factory from the given * environment */ - protected JmsConnectionFactory createConnectionFactory(Hashtable environment) throws URISyntaxException { + protected JmsConnectionFactory createConnectionFactory(Hashtable<Object,Object> environment) throws URISyntaxException { JmsConnectionFactory answer = new JmsConnectionFactory(); - Properties properties = new Properties(); - environment.remove(Context.INITIAL_CONTEXT_FACTORY); - Object o = environment.remove(Context.PROVIDER_URL); + Map<String, String> properties = toMap(environment); + properties.remove(Context.INITIAL_CONTEXT_FACTORY); + Object o = properties.remove(Context.PROVIDER_URL); if (o != null) { answer.setBrokerURI(o.toString()); } - properties.putAll(environment); answer.setProperties(properties); return answer; } + + public Map<String, String> toMap(Hashtable<Object, Object> props) { + Map<String, String> map = new HashMap<String, String>(); + for (Map.Entry<Object, Object> entry : props.entrySet()) { + map.put(entry.getKey().toString(), entry.getValue().toString()); + } + return map; + } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
