Repository: qpid-jms Updated Branches: refs/heads/master 2c1b05192 -> 1aadd71ac
remove erroneously added diff Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/1aadd71a Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/1aadd71a Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/1aadd71a Branch: refs/heads/master Commit: 1aadd71accac87e2811edb365e3dec90e7208356 Parents: 2c1b051 Author: Robert Gemmell <rob...@apache.org> Authored: Fri Feb 6 18:28:26 2015 +0000 Committer: Robert Gemmell <rob...@apache.org> Committed: Fri Feb 6 18:28:26 2015 +0000 ---------------------------------------------------------------------- qpid-jms-client/stop_storing_properties.diff | 52 ----------------------- 1 file changed, 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1aadd71a/qpid-jms-client/stop_storing_properties.diff ---------------------------------------------------------------------- diff --git a/qpid-jms-client/stop_storing_properties.diff b/qpid-jms-client/stop_storing_properties.diff deleted file mode 100644 index 287d565..0000000 --- a/qpid-jms-client/stop_storing_properties.diff +++ /dev/null @@ -1,52 +0,0 @@ -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 faedb56..ab9ab5f 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 -@@ -103,11 +103,6 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact - setBrokerURI(brokerURI); - } - -- @Override -- public void setProperties(Map<String, String> map) { -- buildFromProperties(map); -- } -- - /** - * @param map - */ -diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIStorable.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIStorable.java -index 358ff11..cc04de8 100644 ---- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIStorable.java -+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIStorable.java -@@ -34,8 +34,6 @@ import javax.naming.Referenceable; - */ - public abstract class JNDIStorable implements Referenceable, Externalizable { - -- private Map<String, String> properties; -- - /** - * Set the properties that will represent the instance in JNDI - * -@@ -56,7 +54,6 @@ public abstract class JNDIStorable implements Referenceable, Externalizable { - * @param props - */ - public synchronized void setProperties(Map<String, String> props) { -- this.properties = props; - buildFromProperties(props); - } - -@@ -66,11 +63,9 @@ public abstract class JNDIStorable implements Referenceable, Externalizable { - * @return the properties - */ - public synchronized Map<String, String> getProperties() { -- if (this.properties == null) { -- this.properties = new HashMap<String, String>(); -- } -- populateProperties(this.properties); -- return this.properties; -+ HashMap<String, String> properties = new HashMap<String, String>(); -+ populateProperties(properties); -+ return properties; - } - - /** --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
