Fixed a problem with mergeFrom() where a key that was explicitly mapped to null was taken to mean it had no mapping. Checking that the key has a mapping instead fixes problem.

2018-12-27 14:52:40 -07:00 · 2018-12-27 14:52:40 -07:00 · 416b866c78
commit 416b866c78
parent d785caa5ca
1 changed files with 1 additions and 1 deletions
--- a/jme3-core/src/main/java/com/jme3/system/AppSettings.java
+++ b/jme3-core/src/main/java/com/jme3/system/AppSettings.java
@ -274,7 +274,7 @@ public final class AppSettings extends HashMap<String, Object> {
     */
    public void mergeFrom(AppSettings other) {
        for (String key : other.keySet()) {
-            if (get(key) == null) {
+            if( !this.containsKey(key) ) {
                put(key, other.get(key));
            }
        }