Cleanup code duplication 69/97869/2
authorRobert Varga <robert.varga@pantheon.tech>
Mon, 11 Oct 2021 15:08:40 +0000 (17:08 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Mon, 11 Oct 2021 15:15:24 +0000 (17:15 +0200)
We have a conditional parent sweep block repeated twice, add a private
method to host it.

Change-Id: Id69f00787ad47ca8c15e53e354f318e4ad1d90b2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java

index 9a5441d8e8ab5e1df81532431aaed66cd9e4b31c..b2963a0790f2081e9b9eb273ba62b830301023b6 100644 (file)
@@ -792,6 +792,10 @@ abstract class ReactorStmtCtx<A, D extends DeclaredStatement<A>, E extends Effec
         }
 
         // Propagate towards parent if there is one
+        sweepParent();
+    }
+
+    private void sweepParent() {
         final ReactorStmtCtx<?, ?, ?> parent = getParentContext();
         if (parent != null) {
             parent.sweepOnChildDecrement();
@@ -815,12 +819,9 @@ abstract class ReactorStmtCtx<A, D extends DeclaredStatement<A>, E extends Effec
 
         // parent is potentially reclaimable
         if (noParentRef()) {
-            LOG.trace("Cleanup {} of parent {}", refcount, this);
+            LOG.trace("Cleanup {} of parent {}", refs, this);
             if (sweepState()) {
-                final ReactorStmtCtx<?, ?, ?> parent = getParentContext();
-                if (parent != null) {
-                    parent.sweepOnChildDecrement();
-                }
+                sweepParent();
             }
         }
     }