sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
mitm 2018-12-27 14:52:40 -07:00
parent d785caa5ca
commit 416b866c78
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jme3-core/src/main/java/com/jme3/system/AppSettings.java
View File

@ -274,7 +274,7 @@ public final class AppSettings extends HashMap<String, Object> {
*/ */
public void mergeFrom(AppSettings other) { public void mergeFrom(AppSettings other) {
for (String key : other.keySet()) { for (String key : other.keySet()) {
if (get(key) == null) { if( !this.containsKey(key) ) {
put(key, other.get(key)); put(key, other.get(key));
} }
} }