Merge "Issue #1554 fix XmlGenericMapAdapter to work with null maps." into development
Former-commit-id:ab7e404ffa
[formerly9004e0f57c
] [formerlyab7e404ffa
[formerly9004e0f57c
] [formerly5c1c1ec582
[formerly 2d2dd4cc62a45794a3a912eb75c9d2745815dc4e]]] Former-commit-id:5c1c1ec582
Former-commit-id:e8f382e7c0
[formerly12b6ac3d56
] Former-commit-id:ce740437b1
This commit is contained in:
commit
fd01ca38af
1 changed files with 4 additions and 0 deletions
|
@ -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()) {
|
||||
|
|
Loading…
Add table
Reference in a new issue