QPID-1221: added customizable UUID generation and switched the default strategy to use nameUUIDFromBytes rather than randomUUID

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@683337 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 1 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 c0cfc21ee2..514b0f1213 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
@@ -48,6 +48,8 @@ import org.apache.qpid.framing.CompositeAMQDataBlock;
 import org.apache.qpid.framing.ContentBody;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.ExchangeDeclareBody;
+import org.apache.qpid.util.UUIDGen;
+import org.apache.qpid.util.UUIDs;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -122,6 +124,8 @@ public abstract class BasicMessageProducer extends Closeable implements org.apac
 
     private boolean _disableMessageId;
 
+    private UUIDGen _messageIdGenerator = UUIDs.newGenerator();
+
     private static final ContentBody[] NO_CONTENT_BODIES = new ContentBody[0];
 
     protected BasicMessageProducer(AMQConnection connection, AMQDestination destination, boolean transacted, int channelId,
@@ -460,7 +464,7 @@ public abstract class BasicMessageProducer extends Closeable implements org.apac
         }
         else
         {
-            messageId = UUID.randomUUID();
+            messageId = _messageIdGenerator.generate();
             StringBuilder b = new StringBuilder(39);
             b.append("ID:");
             b.append(messageId);