QPID-1236: made setObjectProperty validate the passed in value

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@685536 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 37 insertions, 0 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java b/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
index 5a57e7b0db..8b4488f1f9 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
@@ -736,10 +736,32 @@ public class AMQMessageDelegate_0_10 implements AMQMessageDelegate
         setApplicationHeader(propertyName, value);
     }
 
+    private static final Set<Class> ALLOWED = new HashSet();
+    static
+    {
+        ALLOWED.add(Boolean.class);
+        ALLOWED.add(Byte.class);
+        ALLOWED.add(Short.class);
+        ALLOWED.add(Integer.class);
+        ALLOWED.add(Long.class);
+        ALLOWED.add(Float.class);
+        ALLOWED.add(Double.class);
+        ALLOWED.add(Character.class);
+        ALLOWED.add(String.class);
+        ALLOWED.add(byte[].class);
+    }
+
     public void setObjectProperty(String propertyName, Object object) throws JMSException
     {
         checkPropertyName(propertyName);
         checkWritableProperties();
+        if (object != null && !ALLOWED.contains(object.getClass()))
+        {
+            throw new MessageFormatException
+                (String.format
+                 ("Cannot set a %s, allowed property types are: %s",
+                  object.getClass(), ALLOWED));
+        }
         setApplicationHeader(propertyName, object);
     }
 
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);