xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Former-commit-id: fc8f8561ca [formerly ab7e404ffa] [formerly 9004e0f57c] [formerly fc8f8561ca [formerly ab7e404ffa] [formerly 9004e0f57c] [formerly 5c1c1ec582 [formerly 9004e0f57c [formerly 2d2dd4cc62a45794a3a912eb75c9d2745815dc4e]]]]
Former-commit-id: 5c1c1ec582
Former-commit-id: 16bec603c6 [formerly e8f382e7c0] [formerly 2ea0cdd5d46c77afe72c0eb7731cc636b8c10f38 [formerly 12b6ac3d56]]
Former-commit-id: ffa2760f315dca8b7a38eb7d6ecd650dc4f68d79 [formerly ce740437b1]
Former-commit-id: fd01ca38af
This commit is contained in:
Dustin Johnson 2013-02-12 07:59:24 -06:00 • committed by Gerrit Code Review
commit 422ddd2e65
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/XmlGenericMapAdapter.java
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()) {