Do not leak schema from startChoiceNode() 51/106451/1
authorRobert Varga <robert.varga@pantheon.tech>
Mon, 12 Jun 2023 15:40:09 +0000 (17:40 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Mon, 12 Jun 2023 15:40:09 +0000 (17:40 +0200)
This is an outlier not used anywhere -- just change the return type to
void. We may revisit it at some point down the line.

Change-Id: I4944ebb0781c82e664b1f45b113194f4f31fc8b9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/NormalizedNodeStreamWriterStack.java

index f0b40e218ad81e7ec00a1691eade70304f8dec45..61d2df0dc22e9ce96cfcdde1d43e6cce92f54d52 100644 (file)
@@ -235,13 +235,11 @@ public final class NormalizedNodeStreamWriterStack implements LeafrefResolver {
         schemaStack.push(leafSetEntryNode(name.getNodeType()));
     }
 
-    public ChoiceSchemaNode startChoiceNode(final NodeIdentifier name) {
+    public void startChoiceNode(final NodeIdentifier name) {
         LOG.debug("Enter choice {}", name);
         final ChoiceEffectiveStatement stmt = dataTree.enterChoice(name.getNodeType());
         verify(stmt instanceof ChoiceSchemaNode, "Node %s is not a choice", stmt);
-        final ChoiceSchemaNode ret = (ChoiceSchemaNode) stmt;
-        schemaStack.push(ret);
-        return ret;
+        schemaStack.push((ChoiceSchemaNode) stmt);
     }
 
     public SchemaNode startContainerNode(final NodeIdentifier name) {