diff options
| author | Keith Wall <kwall@apache.org> | 2012-03-27 11:04:02 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2012-03-27 11:04:02 +0000 |
| commit | 543aefb12560de0fb374c3a25fe3dc0b809a221e (patch) | |
| tree | a2ed89ff318dc598c4070a6221c03154c569a416 /qpid/java/client | |
| parent | 30f5a131dfd3b9d628f3b9cb2dc91ada79993b60 (diff) | |
| download | qpid-python-543aefb12560de0fb374c3a25fe3dc0b809a221e.tar.gz | |
QPID-3913: Add functionality to upgrade bdbstore automatically on broker start-up. Store message content using single chunk. Change store version to 6. Remove implementations of tuple bindings for previous versions.
Applied patch from Phil Harvey<phil@philharveyonline.com> Oleksandr Rudyy<orudyy@gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1305809 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client')
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java index 31a0440b04..bd63cdb5c5 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java @@ -48,9 +48,12 @@ public class FieldTableSupport public static Map<String,Object> convertToMap(FieldTable ft) { Map<String,Object> map = new HashMap<String,Object>(); - for (AMQShortString key: ft.keySet() ) + if(ft != null) { - map.put(key.asString(), ft.getObject(key)); + for (AMQShortString key: ft.keySet() ) + { + map.put(key.asString(), ft.getObject(key)); + } } return map; |