From 75c484d83489bb183af2cd61a02d4a82412efdf2 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 30 Aug 2016 18:41:48 +0200 Subject: [PATCH 1/1] BUG-6497: Do not lose augmentation statement order This is a follow-up patch to keep augmentation order in uses statement. Change-Id: Iaef4aa949d225d914af3a04c111d0ec41aab6451 Signed-off-by: Robert Varga (cherry picked from commit 17d60496211e0b223a63329528352ee7e26e14ff) --- .../stmt/rfc6020/effective/UsesEffectiveStatementImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UsesEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UsesEffectiveStatementImpl.java index 8de17085f2..aa0b580ec3 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UsesEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UsesEffectiveStatementImpl.java @@ -12,7 +12,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import java.util.Collection; import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -59,7 +59,7 @@ public final class UsesEffectiveStatementImpl extends DeclaredEffectiveStatement // initSubstatementCollections Collection> effectiveSubstatements = effectiveSubstatements(); List unknownNodesInit = new LinkedList<>(); - Set augmentationsInit = new HashSet<>(); + Set augmentationsInit = new LinkedHashSet<>(); Map refinesInit = new HashMap<>(); for (EffectiveStatement effectiveStatement : effectiveSubstatements) { if (effectiveStatement instanceof UnknownSchemaNode) { -- 2.36.6