Make sweep-on-decrement more aggressive

[yangtools.git] / yang / yang-parser-reactor / src / main / java / org / opendaylight / yangtools / yang / parser / stmt / reactor / ReactorStmtCtx.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
index 0de3e281e3a9c7f459057c4e034a902fd0087fe5..3fc51ceb6a55849e46c7bc7bc58f9378097c6db5 100644 (file)
--- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
+++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
@@ -175,11 +175,14 @@ abstract class ReactorStmtCtx<A, D extends DeclaredStatement<A>, E extends Effec
     // Called when this statement does not have an implicit reference and have reached REFCOUNT_NONE
     private void sweepOnDecrement() {
         LOG.trace("Sweeping on decrement {}", this);
-        final ReactorStmtCtx<?, ?, ?> parent = parentStmtCtx();
-        if (parent == null) {
-            // We are the top-level object and have lost a reference. Trigger sweep if possible and we are done.
+        if (noParentRefcount()) {
+            // No further parent references, sweep our state.
             sweepState();
-        } else {
+        }
+
+        // Propagate towards parent if there is one
+        final ReactorStmtCtx<?, ?, ?> parent = parentStmtCtx();
+        if (parent != null) {
             parent.sweepOnChildDecrement();
         }
     }