Revert "Bug 5504 - Controller crashes with OOM. oldRoot/currentRoot, toString()"

This reverts commit 9703cf5d2ce0323e0e776dec4311f677ddcd2f00.

Change-Id: I4b33e70154de6eb62ed788a1cda0321cc57f84dd
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractModifiedContainerNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractModifiedContainerNode.java
index ca1a02c71c8ee5b307acdd15f7421dd8fc8bd163..182511da66d9a0237e117efcbc36379869113f9e 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractModifiedContainerNode.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractModifiedContainerNode.java
@@ -43,6 +43,6 @@ abstract class AbstractModifiedContainerNode extends AbstractContainerNode {
 
     @Override
     protected ToStringHelper addToStringAttributes(final ToStringHelper helper) {
-        return helper.add("subtreeVersion", subtreeVersion).add("# children", children.size());
+        return helper.add("subtreeVersion", subtreeVersion).add("children", children);
     }
 }

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/SimpleContainerNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/SimpleContainerNode.java
index c1dd38aa783ae145d8771ec946aa85bc3ace5c07..f184a97cc8783b6f349d277d83c69c7be4fa6f00 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/SimpleContainerNode.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/SimpleContainerNode.java
@@ -37,6 +37,6 @@ final class SimpleContainerNode extends AbstractContainerNode {
 
     @Override
     protected ToStringHelper addToStringAttributes(final ToStringHelper helper) {
-        return helper;
+        return helper.add("data", getData());
     }
 }