add explanation why we don't use CollectionUtils.mergePropertiesIntoMap

also extend .gitignore to avoid adding logs and stuff

Switch Manufacturing and Distribution to Dispo Framework #523

.gitignore

@@ -4,8 +4,12 @@
 **/.settings/
 *.cache
 *.diff
-*.project
-*.classpath
+**/.classpath
+**/.project
+
+**/activemq-data/
+**/data/
+**/log/
 
 de.metas.endcustomer.mf15/metasfresh.properties
 /de.metas.endcustomer.mf15/de.metas.endcustomer.mf15.swingui/log/

de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/util/Env.java

@@ -391,18 +391,21 @@ public static final Properties copyCtx(final Properties ctx)
 
 		final Properties newCtx = new Properties();
 
-		for (Enumeration<?> en = ctx.propertyNames(); en.hasMoreElements();)
+		// we can't use this great tool, because it (reasonably) assumes that the given ctx doews not have null values
+		// org.springframework.util.CollectionUtils.mergePropertiesIntoMap(ctx, newCtx);
+
+		for (final Enumeration<?> en = ctx.propertyNames(); en.hasMoreElements();)
 		{
-			String key = (String)en.nextElement();
+			final String key = (String)en.nextElement();
 			Object value = ctx.get(key);
 			if (value == null)
 			{
-				// Allow for defaults fallback or potentially overridden accessor...
+				// Allow for defaults fallback or potentially overridden accessor
 				value = newCtx.getProperty(key);
 			}
 			if (value == null)
 			{
-				continue;
+				continue; // the given ctx might have null values, so this chack is crucial
 			}
 			newCtx.put(key, value);
 		}