summaryrefslogtreecommitdiff
path: root/qpid/java/client/src/main
diff options
context:
space:
mode:
authorRobert Greig <rgreig@apache.org>2006-12-22 20:32:43 +0000
committerRobert Greig <rgreig@apache.org>2006-12-22 20:32:43 +0000
commit9cad5792c8fa0203114d63a1851b0a9181c967f5 (patch)
treecbf9ee907778b0638a82e3a0474a59e80ce32a63 /qpid/java/client/src/main
parent39e4feab60591fc68efaf404cbd3f9070826fb04 (diff)
downloadqpid-python-9cad5792c8fa0203114d63a1851b0a9181c967f5.tar.gz
QPID-229 : Patch supplied by Rob Godfrey - Change implementation of FieldTable
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@489748 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client/src/main')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java2
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java4
2 files changed, 1 insertions, 5 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index 8f85aedb1f..0dfd469d8d 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
@@ -986,7 +986,7 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi
// ft.put("headers", rawSelector.getDataAsBytes());
if (rawSelector != null)
{
- ft.putAll(rawSelector);
+ ft.addAll(rawSelector);
}
BasicMessageConsumer consumer = new BasicMessageConsumer(_channelId, _connection, amqd, selector, noLocal,
_messageFactoryRegistry, AMQSession.this,
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
index 40d8b28411..0c29344c37 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
@@ -452,10 +452,6 @@ public abstract class AbstractJMSMessage extends AMQMessage implements org.apach
}
}
- public Map getUnderlyingMessagePropertiesMap()
- {
- return getJmsContentHeaderProperties().getHeaders();
- }
public void setUnderlyingMessagePropertiesMap(FieldTable messageProperties)
{