qpid-jms-client/stop_storing_properties.diff

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;
     }
 
     /**