Merge "Issue #1554 fix XmlGenericMapAdapter to work with null maps." into development

Former-commit-id: fc8f8561ca [formerly ab7e404ffa] [formerly 9004e0f57c] [formerly 5c1c1ec582 [formerly 9004e0f57c [formerly 2d2dd4cc62a45794a3a912eb75c9d2745815dc4e]]]
Former-commit-id: 5c1c1ec582
Former-commit-id: 2ea0cdd5d46c77afe72c0eb7731cc636b8c10f38 [formerly 12b6ac3d56]
Former-commit-id: e8f382e7c0
This commit is contained in:
Dustin Johnson 2013-02-12 07:59:24 -06:00 committed by Gerrit Code Review
commit 16bec603c6

View file

@ -56,6 +56,10 @@ public class XmlGenericMapAdapter<K, V> extends
@Override
public MapType<K, V> marshal(Map<K, V> unserialized) throws Exception {
if (unserialized == null) {
return null;
}
MapType<K, V> mapType = new MapType<K, V>();
for (Map.Entry<K, V> entry : unserialized.entrySet()) {