QPID-2744: Property name check in wrong place

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

1 files changed, 2 insertions, 2 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 f9ca9e610c..5145c01054 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
@@ -734,6 +734,8 @@ public class AMQMessageDelegate_0_10 extends AbstractAMQMessageDelegate
     
     public void setObjectProperty(String propertyName, Object object) throws JMSException
     {
+        checkPropertyName(propertyName);
+        checkWritableProperties();
         if (object == null)
         {
             throw new MessageFormatException(AMQPInvalidClassException.INVALID_OBJECT_MSG + "null");
@@ -742,8 +744,6 @@ public class AMQMessageDelegate_0_10 extends AbstractAMQMessageDelegate
         {
             throw new MessageFormatException(AMQPInvalidClassException.INVALID_OBJECT_MSG + object.getClass());
         }
-        checkPropertyName(propertyName);
-        checkWritableProperties();
         setApplicationHeader(propertyName, object);
     }