summaryrefslogtreecommitdiff
path: root/java/common/src
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2007-09-25 08:15:04 +0000
committerMartin Ritchie <ritchiem@apache.org>2007-09-25 08:15:04 +0000
commit069c13b56b24cf60579e788e568f4bae5cf2892d (patch)
tree46d618c0ac41514b26d696d516924ced71b51d36 /java/common/src
parent195ac3b5478f2d030b577298e963533d7e7da599 (diff)
downloadqpid-python-069c13b56b24cf60579e788e568f4bae5cf2892d.tar.gz
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
Diffstat (limited to 'java/common/src')
-rw-r--r--java/common/src/main/java/org/apache/qpid/framing/FieldTable.java5
1 files changed, 4 insertions, 1 deletions
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());