From bbe1a8e048c2499baf61aa53bf61cb4bf5712a18 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Mon, 25 Aug 2014 09:19:47 +0200 Subject: [PATCH] Bug 1604: Fixed incorrect check in Normalized Node Writer startOrderedMapNode Check which was used in startOrderedMapNode was meant to be part of startMapEntry. Check for startOrderedMapNode should be same as for startMapEntry, only used builder should be different. Change-Id: I0062f184cc33ee6d1fd6783933f1f4c845f1c4d4 Signed-off-by: Tony Tkacik --- .../impl/schema/ImmutableNormalizedNodeStreamWriter.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java index c39c2ecd78..fe3d1841a2 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java @@ -176,17 +176,15 @@ public class ImmutableNormalizedNodeStreamWriter implements NormalizedNodeStream @Override public void startMapEntryNode(final NodeIdentifierWithPredicates identifier,final int childSizeHint) throws IllegalArgumentException { if(!(getCurrent() instanceof NormalizedNodeResultBuilder)) { - Preconditions.checkArgument(getCurrent() instanceof ImmutableMapNodeBuilder); + Preconditions.checkArgument(getCurrent() instanceof ImmutableMapNodeBuilder || getCurrent() instanceof ImmutableOrderedMapNodeBuilder); } enter(Builders.mapEntryBuilder().withNodeIdentifier(identifier)); } @Override public void startOrderedMapNode(final NodeIdentifier name,final int childSizeHint) throws IllegalArgumentException { - if(!(getCurrent() instanceof NormalizedNodeResultBuilder)) { - Preconditions.checkArgument(getCurrent() instanceof ImmutableOrderedMapNodeBuilder); - } - enter(Builders.mapBuilder().withNodeIdentifier(name)); + checkDataNodeContainer(); + enter(Builders.orderedMapBuilder().withNodeIdentifier(name)); } @Override -- 2.36.6