diff options
Diffstat (limited to 'qpid/java/common/src/main')
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java index 721c821bab..4a126b8504 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java @@ -832,9 +832,12 @@ public class FieldTable public void addAll(FieldTable fieldTable) { initMapIfNecessary(); - _encodedForm = null; - _properties.putAll(fieldTable._properties); - recalculateEncodedSize(); + if (fieldTable._properties != null) + { + _encodedForm = null; + _properties.putAll(fieldTable._properties); + recalculateEncodedSize(); + } } public static Map<String, Object> convertToMap(final FieldTable fieldTable) |