diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2008-09-25 18:35:11 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2008-09-25 18:35:11 +0000 |
| commit | d4d85f0674ceef648927fc4d1b97034fc96e21c0 (patch) | |
| tree | 7bbcc7acd98aa0dc16fffcfbbe4c394a2b69babd /qpid/java/client/src | |
| parent | 18292d4d79110ab776cc094b4d0d590a29af8d80 (diff) | |
| download | qpid-python-d4d85f0674ceef648927fc4d1b97034fc96e21c0.tar.gz | |
This is a fix for the java client for QPID-943.
The 0-8 and 0-9 clients adds the user_id of the connection to the message properties before sending the message
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@699045 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client/src')
3 files changed, 10 insertions, 0 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java index beaa47ed1e..954a3bc28f 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java @@ -116,6 +116,8 @@ public abstract class BasicMessageProducer extends Closeable implements org.apac private boolean _disableMessageId; private UUIDGen _messageIdGenerator = UUIDs.newGenerator(); + + protected String _userID; // ref user id used in the connection. private static final ContentBody[] NO_CONTENT_BODIES = new ContentBody[0]; @@ -138,6 +140,7 @@ public abstract class BasicMessageProducer extends Closeable implements org.apac _immediate = immediate; _mandatory = mandatory; _waitUntilSent = waitUntilSent; + _userID = connection.getUsername(); } void resubscribe() throws AMQException diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java index 02c5526e03..2810b37d48 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java @@ -77,6 +77,9 @@ public class BasicMessageProducer_0_10 extends BasicMessageProducer DeliveryProperties deliveryProp = delegate.getDeliveryProperties(); MessageProperties messageProps = delegate.getMessageProperties(); + // On the receiving side, this will be read in to the JMSXUserID as well. + messageProps.setUserId(_userID.getBytes()); + if (messageId != null) { messageProps.setMessageId(messageId); @@ -159,6 +162,8 @@ public class BasicMessageProducer_0_10 extends BasicMessageProducer { ssn.sync(); } + + } catch (RuntimeException rte) { diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java index c547fcb488..048065eac9 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java @@ -86,6 +86,8 @@ public class BasicMessageProducer_0_8 extends BasicMessageProducer AMQMessageDelegate_0_8 delegate = (AMQMessageDelegate_0_8) message.getDelegate(); BasicContentHeaderProperties contentHeaderProperties = delegate.getContentHeaderProperties(); + contentHeaderProperties.setUserId(_userID); + if (!_disableTimestamps) { final long currentTime = System.currentTimeMillis(); |