summaryrefslogtreecommitdiff
path: root/java/client/src
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2010-07-22 14:21:47 +0000
committerMartin Ritchie <ritchiem@apache.org>2010-07-22 14:21:47 +0000
commit7a43da08f8cc070bb252ea62eadc59abde92995c (patch)
tree379dcc45f0e1903686ca26fbcf2006b52649153d /java/client/src
parent167570b1632574a9e81e8f2a62e58d537a88dd12 (diff)
downloadqpid-python-7a43da08f8cc070bb252ea62eadc59abde92995c.tar.gz
QPID-2744 : Add tests for correct exception when null object is set via setObjectProperty in Field Table and via JMS Properties
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@966680 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/client/src')
-rw-r--r--java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java2
1 files changed, 1 insertions, 1 deletions
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 cac465e533..ae1f354863 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 primatives are allowed object is:" + object.getClass());
+ MessageFormatException mfe = new MessageFormatException("Only Primitives objects allowed Object is:" + (object == null ? "null" : object.getClass()));
mfe.setLinkedException(aice);
mfe.initCause(aice);
throw mfe;