diff options
Diffstat (limited to 'qpid/java/client')
3 files changed, 8 insertions, 38 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 5bb2955399..9d01fbfaa2 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 @@ -459,24 +459,10 @@ public abstract class BasicMessageProducer extends Closeable implements org.apac } else { - if (message.getJMSMessageID() == null) - { - message.setJMSMessageID(UUID.randomUUID().toString()); - } - } - - int type; - if (destination instanceof Topic) - { - type = AMQDestination.TOPIC_TYPE; - } - else if (destination instanceof Queue) - { - type = AMQDestination.QUEUE_TYPE; - } - else - { - type = AMQDestination.UNKNOWN_TYPE; + StringBuilder b = new StringBuilder(39); + b.append("ID:"); + b.append(UUID.randomUUID()); + message.setJMSMessageID(b.toString()); } sendMessage(destination, origMessage, message, deliveryMode, priority, timeToLive, mandatory, immediate, wait); 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 5fd6c23f68..8f95c99ac6 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 @@ -135,17 +135,6 @@ public class BasicMessageProducer_0_10 extends BasicMessageProducer deliveryProp.setRoutingKey(routingKey); } - if (message != origMessage) - { - _logger.debug("Updating original message"); - origMessage.setJMSPriority(message.getJMSPriority()); - origMessage.setJMSTimestamp(message.getJMSTimestamp()); - _logger.debug("Setting JMSExpiration:" + message.getJMSExpiration()); - origMessage.setJMSExpiration(message.getJMSExpiration()); - origMessage.setJMSMessageID(message.getJMSMessageID()); - origMessage.setJMSDeliveryMode(deliveryMode); - } - BasicContentHeaderProperties contentHeaderProperties = message.getContentHeaderProperties(); if (contentHeaderProperties.reset()) { @@ -155,7 +144,10 @@ public class BasicMessageProducer_0_10 extends BasicMessageProducer // XXX: fixme String mid = message.getJMSMessageID(); - messageProps.setMessageId(UUID.fromString(mid.substring(3))); + if( mid != null ) + { + messageProps.setMessageId(UUID.fromString(mid.substring(3))); + } AMQShortString correlationID = contentHeaderProperties.getCorrelationId(); if (correlationID != null) 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 f57f0ff252..ab284116af 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 @@ -168,14 +168,6 @@ public abstract class AbstractJMSMessage extends AMQMessage implements org.apach public String getJMSMessageID() throws JMSException { - if (getContentHeaderProperties().getMessageIdAsString() == null) - { - StringBuilder b = new StringBuilder(39); - b.append("ID:"); - b.append(UUID.randomUUID()); - getContentHeaderProperties().setMessageId(b.toString()); - } - return getContentHeaderProperties().getMessageIdAsString(); } |