You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ar...@apache.org on 2008/10/20 11:36:38 UTC
svn commit: r706166 - in /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message: AbstractJMSMessageFactory.java MessageFactoryRegistry.java

Author: arnaudsimon
Date: Mon Oct 20 02:36:38 2008
New Revision: 706166

URL: http://svn.apache.org/viewvc?rev=706166&view=rev
Log:
qpid-1374: Added handling of null message properties

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

Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java?rev=706166&r1=706165&r2=706166&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java Mon Oct 20 02:36:38 2008
@@ -131,8 +131,18 @@
                     .remaining());
         }
         // set the properties of this message
-        MessageProperties mprop = (MessageProperties) contentHeader[0];
-        DeliveryProperties devprop = (DeliveryProperties) contentHeader[1];
+        MessageProperties mprop;
+        DeliveryProperties devprop;
+        if( contentHeader.length >1 )
+        {
+          mprop = (MessageProperties) contentHeader[0];
+          devprop = (DeliveryProperties) contentHeader[1];
+        }
+        else
+        {
+          mprop = new MessageProperties();
+          devprop = (DeliveryProperties) contentHeader[0];
+        }
 
         AMQMessageDelegate delegate = new AMQMessageDelegate_0_10(mprop, devprop, messageNbr);
 

Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java?rev=706166&r1=706165&r2=706166&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java Mon Oct 20 02:36:38 2008
@@ -125,12 +125,16 @@
     {
 
         MessageProperties mprop = transfer.getHeader().get(MessageProperties.class);
-        String messageType = mprop.getContentType();
-        if (messageType == null)
+        String messageType = "";
+        if ( mprop == null || mprop.getContentType() == null)
         {
             _logger.debug("no message type specified, building a byte message");
             messageType = JMSBytesMessage.MIME_TYPE;
         }
+        else
+        {
+           messageType = mprop.getContentType();
+        }
         MessageFactory mf = _mimeStringToFactoryMap.get(messageType);
         if (mf == null)
         {