diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2012-03-01 15:50:27 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2012-03-01 15:50:27 +0000 |
| commit | 92be7e8f3163c048a8642d2deeaa921bbb65dc9c (patch) | |
| tree | 5c0fa12fa0787d8870eab113469f74ccfb07a5be /qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java | |
| parent | e78f6a9e59098ac104892a79b74c9895272b292e (diff) | |
| download | qpid-python-92be7e8f3163c048a8642d2deeaa921bbb65dc9c.tar.gz | |
NO-JIRA: [AMQP 1-0 Sandbox] merging from trunk
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/rg-amqp-1-0-sandbox@1295635 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java index 4faca15eb0..dfad9157c5 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java @@ -275,10 +275,10 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener, Mes { if(arguments.containsKey(QPID_SHARED_MSG_GROUP) && String.valueOf(arguments.get(QPID_SHARED_MSG_GROUP)).equals("1")) { - String defaultGroup = String.valueOf(arguments.get(QPID_DEFAULT_MESSAGE_GROUP)); + Object defaultGroup = arguments.get(QPID_DEFAULT_MESSAGE_GROUP); _messageGroupManager = new DefinedGroupMessageGroupManager(String.valueOf(arguments.get(QPID_GROUP_HEADER_KEY)), - defaultGroup == null ? QPID_NO_GROUP : defaultGroup, + defaultGroup == null ? QPID_NO_GROUP : defaultGroup.toString(), this); } else @@ -2255,9 +2255,9 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener, Mes public boolean equals(Object o) { - assert o != null; - assert o instanceof QueueEntryListener; - return _sub == ((QueueEntryListener) o)._sub; + return o != null + && o instanceof SimpleAMQQueue.QueueEntryListener + && _sub == ((QueueEntryListener) o)._sub; } public int hashCode() |