[jboss-cvs] JBoss Messaging SVN: r7885 - in branches/Branch_1_4: tests/src/org/jboss/test/messaging/jms/message and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: gaohoward
Date: 2009-10-30 02:02:50 -0400 (Fri, 30 Oct 2009)
New Revision: 7885

Modified:
   branches/Branch_1_4/src/main/org/jboss/jms/message/JBossMapMessage.java
   branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/message/MapMessageTest.java
Log:
JBMESSAGING-1749
added mapMessage.support.null.object property


Modified: branches/Branch_1_4/src/main/org/jboss/jms/message/JBossMapMessage.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/message/JBossMapMessage.java	2009-10-29 16:53:14 UTC (rev 7884)
+++ branches/Branch_1_4/src/main/org/jboss/jms/message/JBossMapMessage.java	2009-10-30 06:02:50 UTC (rev 7885)
@@ -220,7 +220,7 @@
          ((Map)getPayload()).put(name, value);
       else if (value instanceof byte[])
          ((Map)getPayload()).put(name, ((byte[]) value).clone());
-      else if (value == null)
+      else if (value == null && (!System.getProperty("mapMessage.support.null.object", "notexist").equals("notexist")))
          ((Map)getPayload()).put(name, value);
       else
          throw new MessageFormatException("Invalid object type.");

Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/message/MapMessageTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/message/MapMessageTest.java	2009-10-29 16:53:14 UTC (rev 7884)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/message/MapMessageTest.java	2009-10-30 06:02:50 UTC (rev 7885)
@@ -25,6 +25,7 @@
 import javax.jms.JMSException;
 import javax.jms.MapMessage;
 import javax.jms.Message;
+import javax.jms.MessageFormatException;
 
 /**
  * A test that sends/receives map messages to the JMS provider and verifies their integrity.
@@ -89,6 +90,17 @@
    {
       MapMessage m = session.createMapMessage();
 
+      try
+      {
+         m.setObject("nullObject", null);
+         fail("by default null value is not supported, should throw MessageFormatException.");
+      }
+      catch (MessageFormatException e)
+      {
+         //ok, expected.
+      }
+
+      System.setProperty("mapMessage.support.null.object", "");
       m.setObject("nullObject", null);
 
       queueProd.send(m);
@@ -102,6 +114,7 @@
       log.info("String is " + rm.getString("nullValue"));
 
       assertNull(rm.getObject("nullObject"));
+      System.clearProperty("mapMessage.support.null.object");
    }
 
    // Protected -----------------------------------------------------