From 069c13b56b24cf60579e788e568f4bae5cf2892d Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Tue, 25 Sep 2007 08:15:04 +0000 Subject: QPID-604 Commited patch provided by Aidan Skinner, to prevent NPE in FieldTable. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@579115 13f79535-47bb-0310-9956-ffa450edef68 --- java/common/src/main/java/org/apache/qpid/framing/FieldTable.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'java/common/src') diff --git a/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java b/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java index 3438770450..46b10b5963 100644 --- a/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java +++ b/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java @@ -711,7 +711,10 @@ public class FieldTable if (trace) { _logger.trace("FieldTable::writeToBuffer: Writing encoded length of " + getEncodedSize() + "..."); - _logger.trace(_properties.toString()); + if (_properties != null) + { + _logger.trace(_properties.toString()); + } } EncodingUtils.writeUnsignedInteger(buffer, getEncodedSize()); -- cgit v1.2.1