commit 33a9519e433c7bd0d373f0616a734af52cbbaeef
author Gilles Sadowski <gilles@harfang.homelinux.org> Thu Nov 28 12:41:22 2019 +0100
committer Gilles Sadowski <gilles@harfang.homelinux.org> Thu Nov 28 12:41:22 2019 +0100
tree c446a96bfb953aff78c9c3068ec6e54698d726f9
parent bb673507a02c47887a3675b0d129fce8c0a5be3a

Merge "if" statements.

Reported by "soundcloud.io".

commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/bsp/AbstractBSPTree.java

diff --git a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/bsp/AbstractBSPTree.java b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/bsp/AbstractBSPTree.java
index 3825353..b5aa0e0 100644
--- a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/bsp/AbstractBSPTree.java
+++ b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/bsp/AbstractBSPTree.java
@@ -833,14 +833,12 @@
         /** {@inheritDoc} */
         @Override
         public int depth() {
-            if (depth == UNKNOWN_VALUE) {
-                // calculate our depth based on our parent's depth, if
-                // possible
-                if (parent != null) {
-                    final int parentDepth = parent.depth();
-                    if (parentDepth != UNKNOWN_VALUE) {
-                        depth = parentDepth + 1;
-                    }
+            // Calculate our depth based on our parent's depth, if possible.
+            if (depth == UNKNOWN_VALUE &&
+                parent != null) {
+                final int parentDepth = parent.depth();
+                if (parentDepth != UNKNOWN_VALUE) {
+                    depth = parentDepth + 1;
                 }
             }
             return depth;