From 3139609929dec233b247393d7738c1ddf9408697 Mon Sep 17 00:00:00 2001 From: Andrew Donald Kennedy Date: Sun, 1 Aug 2010 14:20:14 +0000 Subject: QPID-2744: Unify 0-10 and 0-8 error messages for invalid object types in properties git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@981231 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/client/message/AMQMessageDelegate_0_10.java | 14 ++++++-------- .../org/apache/qpid/client/message/JMSHeaderAdapter.java | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'java/client/src') 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 78bdac2680..f9ca9e610c 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 @@ -37,6 +37,7 @@ import javax.jms.MessageNotWriteableException; import javax.jms.Session; import org.apache.qpid.AMQException; +import org.apache.qpid.AMQPInvalidClassException; import org.apache.qpid.collections.ReferenceMap; import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQSession; @@ -730,22 +731,19 @@ public class AMQMessageDelegate_0_10 extends AbstractAMQMessageDelegate ALLOWED.add(String.class); ALLOWED.add(byte[].class); } - + public void setObjectProperty(String propertyName, Object object) throws JMSException { - checkPropertyName(propertyName); - checkWritableProperties(); if (object == null) { - throw new MessageFormatException("Object is null"); + throw new MessageFormatException(AMQPInvalidClassException.INVALID_OBJECT_MSG + "null"); } else if (!ALLOWED.contains(object.getClass())) { - throw new MessageFormatException - (String.format - ("Cannot set a %s, allowed property types are: %s", - object.getClass(), ALLOWED)); + throw new MessageFormatException(AMQPInvalidClassException.INVALID_OBJECT_MSG + object.getClass()); } + checkPropertyName(propertyName); + checkWritableProperties(); setApplicationHeader(propertyName, object); } diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java b/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java index ae1f354863..2e4a6eeb6b 100644 --- a/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java +++ b/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java @@ -400,7 +400,7 @@ public final class JMSHeaderAdapter } catch (AMQPInvalidClassException aice) { - MessageFormatException mfe = new MessageFormatException("Only Primitives objects allowed Object is:" + (object == null ? "null" : object.getClass())); + MessageFormatException mfe = new MessageFormatException(AMQPInvalidClassException.INVALID_OBJECT_MSG + (object == null ? "null" : object.getClass())); mfe.setLinkedException(aice); mfe.initCause(aice); throw mfe; -- cgit v1.2.1