You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ma...@apache.org on 2007/01/24 19:51:23 UTC

svn commit: r499532 - /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java

Author: marnie
Date: Wed Jan 24 10:51:22 2007
New Revision: 499532

URL: http://svn.apache.org/viewvc?view=rev&rev=499532
Log:
QPID-315
Updated and tidied class prior to addition of tests

Modified:
    incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java

Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java?view=diff&rev=499532&r1=499531&r2=499532
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java Wed Jan 24 10:51:22 2007
@@ -67,6 +67,7 @@
         }
 
         _newMessage = nativeMsg;
+        setMessageProperties(message);
     }
 
     public MessageConverter(MapMessage message) throws JMSException
@@ -80,6 +81,7 @@
             nativeMessage.setObject(name, message.getObject(name));
         }
         _newMessage = (AbstractJMSMessage) nativeMessage;
+        setMessageProperties(message);
     }
 
     public MessageConverter(ObjectMessage message) throws JMSException
@@ -90,6 +92,7 @@
         nativeMessage.setObject(origMessage.getObject());
 
         _newMessage = (AbstractJMSMessage) nativeMessage;
+        setMessageProperties(message);
 
     }
 
@@ -100,6 +103,7 @@
         nativeMessage.setText(message.getText());
 
         _newMessage = (AbstractJMSMessage) nativeMessage;
+        setMessageProperties(message);
     }
 
     public MessageConverter(StreamMessage message) throws JMSException
@@ -119,7 +123,7 @@
             //we're at the end so don't mind the exception
         }
         _newMessage = (AbstractJMSMessage) nativeMessage;
-
+        setMessageProperties(message);
     }
 
     public AbstractJMSMessage getConvertedMessage()
@@ -141,17 +145,17 @@
      */
     protected void setNonJMSProperties(Message message) throws JMSException
     {
-          Enumeration propertyNames = message.getPropertyNames();
-            while (propertyNames.hasMoreElements())
+        Enumeration propertyNames = message.getPropertyNames();
+        while (propertyNames.hasMoreElements())
+        {
+            String propertyName = String.valueOf(propertyNames.nextElement());
+            //TODO: Shouldn't need to check for JMS properties here as don't think getPropertyNames() returns them
+            if (!propertyName.startsWith("JMSX_"))
             {
-                String propertyName = String.valueOf(propertyNames.nextElement());
-                //TODO: Shouldn't need to check for JMS properties here as don't think getPropertyNames() returns them
-                if (!propertyName.startsWith("JMSX_"))
-                {
-                    Object value = message.getObjectProperty(propertyName);
-                    _newMessage.setObjectProperty(propertyName, value);
-                }
+                Object value = message.getObjectProperty(propertyName);
+                _newMessage.setObjectProperty(propertyName, value);
             }
+        }
     }
 
     /**