From a256a3dc8a893e6f2ac59bc87f7f3961389eb0b6 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 25 Feb 2019 12:19:49 +0100 Subject: [PATCH] Fix EffectiveRibInWriter uptodate handling One of the uptodate checking paths was passing entire attributes rather than just the uptodate leaf. Fix that. JIRA: BGPCEP-495 Change-Id: Ib66a34d9a97f76234bd2105cd2b985a03f78d7b7 Signed-off-by: Robert Varga --- .../protocol/bgp/rib/impl/EffectiveRibInWriter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java index aa0fdea0f4..15c0da7702 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java @@ -330,7 +330,8 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn final YangInstanceIdentifier effAttrsPath = effectiveTablePath.node(ATTRIBUTES_NID); final Optional> optAttrsAfter = modifiedAttrs.getDataAfter(); if (optAttrsAfter.isPresent()) { - tx.put(LogicalDatastoreType.OPERATIONAL, effAttrsPath, effectiveAttributes(optAttrsAfter)); + tx.put(LogicalDatastoreType.OPERATIONAL, effAttrsPath, effectiveAttributes( + NormalizedNodes.findNode(optAttrsAfter.get(), UPTODATE_NID))); } else { tx.delete(LogicalDatastoreType.OPERATIONAL, effAttrsPath); } -- 2.36.6