diff options
Diffstat (limited to 'qpid/java/client/src/main')
3 files changed, 13 insertions, 15 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java index 72fc74e19c..99154e820f 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java @@ -123,10 +123,10 @@ public class AddressHelper @SuppressWarnings("unchecked") public List<Binding> getBindings(Map props) { - List<Binding> bindings = new ArrayList<Binding>(); List<Map> bindingList = (props == null) ? Collections.EMPTY_LIST : (List<Map>) props.get(X_BINDINGS); - if (bindingList != null) + if (bindingList != null && !bindingList.isEmpty()) { + List<Binding> bindings = new ArrayList<Binding>(bindingList.size()); for (Map bindingMap : bindingList) { Binding binding = new Binding( @@ -138,8 +138,12 @@ public class AddressHelper .get(ARGUMENTS)); bindings.add(binding); } + return bindings; + } + else + { + return Collections.emptyList(); } - return bindings; } public Map getDeclareArgs(Map props) diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java index 40a84ebd02..a614690f83 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java @@ -20,7 +20,6 @@ */ package org.apache.qpid.client.messaging.address; -import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -43,7 +42,7 @@ public class Link private int _producerCapacity = 0; private Subscription subscription; private Reliability reliability = Reliability.AT_LEAST_ONCE; - private List<Binding> _bindings = new ArrayList<Binding>(); + private List<Binding> _bindings = Collections.emptyList(); private SubscriptionQueue _subscriptionQueue; public Reliability getReliability() @@ -206,7 +205,7 @@ public class Link public static class Subscription { - private Map<String,Object> args = new HashMap<String,Object>(); + private Map<String,Object> args = Collections.emptyMap(); private boolean exclusive = false; public Map<String, Object> getArgs() diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Node.java b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Node.java index 005f98f344..cc8e11b91a 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Node.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Node.java @@ -21,15 +21,14 @@ package org.apache.qpid.client.messaging.address; -import org.apache.qpid.client.AMQDestination; -import org.apache.qpid.client.AMQDestination.Binding; - -import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.qpid.client.AMQDestination; +import org.apache.qpid.client.AMQDestination.Binding; + public class Node { private int _nodeType = AMQDestination.UNKNOWN_TYPE; @@ -39,7 +38,7 @@ public class Node private boolean _isExclusive; private String _alternateExchange; private String _exchangeType = "topic"; // used when node is an exchange instead of a queue. - private List<Binding> _bindings = new ArrayList<Binding>(); + private List<Binding> _bindings = Collections.emptyList(); private Map<String,Object> _declareArgs = new HashMap<String,Object>(); protected Node(String name) @@ -112,10 +111,6 @@ public class Node _bindings = bindings; } - public void addBinding(Binding binding) { - this._bindings.add(binding); - } - public Map<String,Object> getDeclareArgs() { return _declareArgs; |