qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rob...@apache.org
Subject [1/7] qpid-jms git commit: Stop storing the properties map, or overriding methods to ensure that we dont. It isnt really used and this will ensures it doesnt became stale before it is used again later.
Date Fri, 23 Jan 2015 17:39:36 GMT
Repository: qpid-jms
Updated Branches:
  refs/heads/master 41c040a89 -> 5b28856af


Stop storing the properties map, or overriding methods to ensure that we dont. It isnt really
used and this will ensures it doesnt became stale before it is used again later.


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/5b28856a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/5b28856a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/5b28856a

Branch: refs/heads/master
Commit: 5b28856afc9d4d6098d6c6d22530a3f7e55f4a90
Parents: 642874d
Author: Robert Gemmell <robbie@apache.org>
Authored: Fri Jan 23 17:19:17 2015 +0000
Committer: Robert Gemmell <robbie@apache.org>
Committed: Fri Jan 23 17:39:01 2015 +0000

----------------------------------------------------------------------
 .../java/org/apache/qpid/jms/JmsConnectionFactory.java   |  5 -----
 .../main/java/org/apache/qpid/jms/jndi/JNDIStorable.java | 11 +++--------
 2 files changed, 3 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5b28856a/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 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
      */

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5b28856a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIStorable.java
----------------------------------------------------------------------
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-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message