#429 Fixing NPE issue in MapPropertiesSource

Author: rjrudin

src/main/java/com/marklogic/appdeployer/util/MapPropertiesSource.java

@@ -21,7 +21,12 @@ public MapPropertiesSource(Map<String, String> map) {
 	@Override
 	public Properties getProperties() {
 		Properties props = new Properties();
-		props.putAll(map);
+		for (String key : map.keySet()) {
+			String value = map.get(key);
+			if (value != null) {
+				props.setProperty(key, value);
+			}
+		}
 		return props;
 	}
 }

src/test/java/com/marklogic/appdeployer/util/MapPropertiesSourceTest.java

@@ -0,0 +1,22 @@
+package com.marklogic.appdeployer.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+public class MapPropertiesSourceTest extends Assert {
+
+	@Test
+	public void propertiesWithNull() {
+		Map<String, String> map = new HashMap<>();
+		map.put("hello", "world");
+		map.put("isNull", null);
+
+		Properties props = new MapPropertiesSource(map).getProperties();
+		assertEquals("world", props.getProperty("hello"));
+		assertFalse(props.containsKey("isNull"));
+	}
+}