summaryrefslogtreecommitdiff
path: root/qpid/java/client/src/main
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
commit7cecf190a22f70317bc8f79b2770c04565d3ee84 (patch)
tree3eb6f687c0744435a88f05ead28588352db80a4b /qpid/java/client/src/main
parent21844710b4e6726220e0d9150551566dd7fa13b6 (diff)
downloadqpid-python-7cecf190a22f70317bc8f79b2770c04565d3ee84.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@966680 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client/src/main')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java
index cac465e533..ae1f354863 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java
+++ b/qpid/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;