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

Fixed the null child check to throw IllegalArgumentException instead of NullPointerException

Browse Source 
because user code should never throw NullPointerException.
Also made trying to add a child to itself an error instead of a no-op.  Attempting
to do something like guiNode.attachChild(guiNode) will now throw an IllegalArgumentException.
This commit is contained in:
Paul Speed 2019-11-28 15:56:15 -05:00
parent c23f28b51c
commit c73fd99dd6
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jme3-core/src/main/java/com/jme3/scene/Node.java
View File

@ -345,10 +345,13 @@ public class Node extends Spatial {
* @throws NullPointerException if child is null.
*/
public int attachChildAt(Spatial child, int index) {
if (child == null)
throw new NullPointerException();
if (child.getParent() != this && child != this) {
if (child == null) {
throw new IllegalArgumentException("child cannot be null");
}
if (child == this) {
throw new IllegalArgumentException("Cannot add child to itself");
}
if (child.getParent() != this) {
if (child.getParent() != null) {
child.getParent().detachChild(child);
}