1 files changed, 15 insertions, 0 deletions
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
index 1b3dffe9b9..96a162dec3 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
@@ -39,6 +39,7 @@ import javax.jms.Connection;
 import javax.jms.Destination;
 import javax.jms.JMSException;
 import javax.jms.Message;
+import javax.jms.MessageFormatException;
 import javax.jms.MessageListener;
 import javax.jms.MessageProducer;
 import javax.jms.Queue;
@@ -142,6 +143,20 @@ public class PropertyValueTest extends QpidTestCase implements MessageListener
         }
     }
 
+    public void testSetDisallowedClass() throws Exception
+    {
+        Message m = getTestMessage();
+        try
+        {
+            m.setObjectProperty("foo", new Object());
+            fail("expected a MessageFormatException");
+        }
+        catch (MessageFormatException e)
+        {
+            // pass
+        }
+    }
+
     public void testOnce()
     {
         runBatch(1);