You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2008/09/25 20:35:12 UTC
svn commit: r699045 - in
/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client:
BasicMessageProducer.java BasicMessageProducer_0_10.java
BasicMessageProducer_0_8.java
Author: rajith
Date: Thu Sep 25 11:35:11 2008
New Revision: 699045
URL: http://svn.apache.org/viewvc?rev=699045&view=rev
Log:
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
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java?rev=699045&r1=699044&r2=699045&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java Thu Sep 25 11:35:11 2008
@@ -116,6 +116,8 @@
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 @@
_immediate = immediate;
_mandatory = mandatory;
_waitUntilSent = waitUntilSent;
+ _userID = connection.getUsername();
}
void resubscribe() throws AMQException
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java?rev=699045&r1=699044&r2=699045&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java Thu Sep 25 11:35:11 2008
@@ -77,6 +77,9 @@
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 @@
{
ssn.sync();
}
+
+
}
catch (RuntimeException rte)
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java?rev=699045&r1=699044&r2=699045&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java Thu Sep 25 11:35:11 2008
@@ -86,6 +86,8 @@
AMQMessageDelegate_0_8 delegate = (AMQMessageDelegate_0_8) message.getDelegate();
BasicContentHeaderProperties contentHeaderProperties = delegate.getContentHeaderProperties();
+ contentHeaderProperties.setUserId(_userID);
+
if (!_disableTimestamps)
{
final long currentTime = System.currentTimeMillis();