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

Merge pull request #514 from NemesisMate/patch-9

Browse Source 
userdata to null again once all data is removed.
This commit is contained in:
empirephoenix 2016-06-26 21:51:29 +02:00 committed by GitHub
commit c288d7427a
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
jme3-core/src/main/java/com/jme3/scene/Spatial.java
View File

@ -1524,16 +1524,22 @@ public abstract class Spatial implements Savable, Cloneable, Collidable, Cloneab
} }
public void setUserData(String key, Object data) { public void setUserData(String key, Object data) {
if (userData == null) { if (data == null) {
userData = new HashMap<String, Savable>(); if (userData != null) {
} userData.remove(key);
if(userData.isEmpty()) {
if(data == null){ userData = null;
userData.remove(key); }
}else if (data instanceof Savable) { }
userData.put(key, (Savable) data);
} else { } else {
userData.put(key, new UserData(UserData.getObjectType(data), data)); if (userData == null) {
userData = new HashMap<String, Savable>();
}
if (data instanceof Savable) {
userData.put(key, (Savable) data);
} else {
userData.put(key, new UserData(UserData.getObjectType(data), data));
}
} }
} }