diff options
| author | Robert Greig <rgreig@apache.org> | 2006-12-22 20:32:43 +0000 |
|---|---|---|
| committer | Robert Greig <rgreig@apache.org> | 2006-12-22 20:32:43 +0000 |
| commit | 9cad5792c8fa0203114d63a1851b0a9181c967f5 (patch) | |
| tree | cbf9ee907778b0638a82e3a0474a59e80ce32a63 /qpid/java/client/src | |
| parent | 39e4feab60591fc68efaf404cbd3f9070826fb04 (diff) | |
| download | qpid-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')
3 files changed, 2 insertions, 7 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) { diff --git a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java index 83969822c4..184d7cb015 100644 --- a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java +++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java @@ -17,7 +17,6 @@ import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.framing.FieldTable; -import org.apache.qpid.framing.PropertyFieldTable; import org.apache.qpid.url.AMQBindingURL; import org.apache.qpid.url.BindingURL; @@ -53,7 +52,7 @@ public class StreamMessageTest extends TestCase AMQHeadersExchange queue = new AMQHeadersExchange(new AMQBindingURL(ExchangeDefaults.HEADERS_EXCHANGE_CLASS+"://"+ExchangeDefaults.HEADERS_EXCHANGE_NAME+"/test/queue1?"+ BindingURL.OPTION_ROUTING_KEY+"='F0000=1'")); - FieldTable ft = new PropertyFieldTable(); + FieldTable ft = new FieldTable(); ft.setString("F1000","1"); MessageConsumer consumer = consumerSession.createConsumer(queue, AMQSession.DEFAULT_PREFETCH_LOW_MARK, AMQSession.DEFAULT_PREFETCH_HIGH_MARK, false, false, (String)null, ft); |