diff options
| author | Keith Wall <kwall@apache.org> | 2011-11-09 08:59:26 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2011-11-09 08:59:26 +0000 |
| commit | 03485e0e416d74c74c305bfbcb0864628c8075fe (patch) | |
| tree | 2a8face28024b691002a2bc13b3ce9d6490fc3cb /java/common/src/main | |
| parent | cc6176cfb9c22ae2cdf56b03d33aca8975b7cd71 (diff) | |
| download | qpid-python-03485e0e416d74c74c305bfbcb0864628c8075fe.tar.gz | |
QPID-3519: refactor consumer argument handling
Applied patch from Oleksandr Rudyy<orudyy@gmail.com> and myself.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1199664 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/common/src/main')
| -rw-r--r-- | java/common/src/main/java/org/apache/qpid/framing/FieldTable.java | 9 |
1 files changed, 6 insertions, 3 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 721c821bab..4a126b8504 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 @@ -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) |