From 2fc8dca2524c041ff45fc98f32b02bdd78a5202a Mon Sep 17 00:00:00 2001
From: Ben Steffensmeier <Benjamin.P.Steffensmeier@raytheon.com>
Date: Mon, 11 Feb 2013 15:11:18 -0600
Subject: [PATCH] Issue #1554 fix XmlGenericMapAdapter to work with null maps.

Former-commit-id: aee7dc0f401fca9adea281f9479c311d7163091d [formerly 4a7d94ecbdb6ab4bda6ef64bdc526d34633ca5b3] [formerly 60c435861a9b627a0f1fca498b13ac1f68d21537] [formerly aee7dc0f401fca9adea281f9479c311d7163091d [formerly 4a7d94ecbdb6ab4bda6ef64bdc526d34633ca5b3] [formerly 60c435861a9b627a0f1fca498b13ac1f68d21537] [formerly 7220c4c6cc40f12b903f916c2d34dc6aff8062ac [formerly 60c435861a9b627a0f1fca498b13ac1f68d21537 [formerly 904e3387de59f534b6457c7a12e8f94d55974884]]]]
Former-commit-id: 7220c4c6cc40f12b903f916c2d34dc6aff8062ac
Former-commit-id: 599e8ee881cff2625af94b1a63943b137cf24dbb [formerly ae0ac4e21cee16200e6ecc88e826b83c7f47f78c] [formerly f83f8d891df58415630ea3a26ab15d5369e50030 [formerly 21616e06ceb219945bd7e0bad502bc97986d1916]]
Former-commit-id: 38678bb00e1714303296a9ac0c85fae49b08d5da [formerly 5c0d24561300ce370855b1f3cb973aa96e860cf4]
Former-commit-id: 74a76c1acf79b42a95731d0096878f99ff69fc05
---
 .../uf/common/serialization/XmlGenericMapAdapter.java         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/XmlGenericMapAdapter.java b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/XmlGenericMapAdapter.java
index d124696c39..4939d2cdbb 100644
--- a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/XmlGenericMapAdapter.java
+++ b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/XmlGenericMapAdapter.java
@@ -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()) {