diff options
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; |