Merge pull request #514 from NemesisMate/patch-9

userdata to null again once all data is removed.

jme3-core/src/main/java/com/jme3/scene/Spatial.java

@@ -1524,16 +1524,22 @@ public abstract class Spatial implements Savable, Cloneable, Collidable, Cloneab
     }
 
     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 {
-            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));
+            }
         }
     }