svn commit: r662755 - in /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client: BasicMessageProducer.java BasicMessageProducer_0_10.java message/AbstractJMSMessage.java

[arnaudsimon]

Author: arnaudsimon
Date: Tue Jun  3 04:52:47 2008
New Revision: 662755

URL: http://svn.apache.org/viewvc?rev=662755&view=rev
Log:
QPID-1115: Only generate client ID when necessary

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/message/AbstractJMSMessage.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=662755&r1=662754&r2=662755&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
 Tue Jun  3 04:52:47 2008
@@ -459,24 +459,10 @@
         }
         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);

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=662755&r1=662754&r2=662755&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
 Tue Jun  3 04:52:47 2008
@@ -135,17 +135,6 @@
             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 @@
 
             // 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)

Modified: 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java?rev=662755&r1=662754&r2=662755&view=diff
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
 Tue Jun  3 04:52:47 2008
@@ -168,14 +168,6 @@
 
     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();
     }