BUG-5548: NH serializer removal

Correction of removing the NH serializers

Change-Id: Ica72b9ac71a7f412d528950f7afda68e1ec03fc5
Signed-off-by: Iveta Halanova <ihalanov@cisco.com>
(cherry picked from commit ad0aaba85749c7af489867e4c91a9f800ed63565)

diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java
index 31d87102b2279d5865a3c138a2a1b195a91134ab..2f0e8d05656f2b5248340efb8389c0b350be1464 100644 (file)
--- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java
+++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java
@@ -108,9 +108,11 @@ final class SimpleNlriRegistry implements NlriRegistry {
                     SimpleNlriRegistry.this.handlers.remove(key);
                     SimpleNlriRegistry.this.nextHopParsers.remove(key);
                     if (cNextHopClass != null) {
-                        SimpleNlriRegistry.this.nextHopSerializers.remove(cNextHopClass);
+                        final Map.Entry<Class<? extends CNextHop>, BgpTableType> nhKey = new AbstractMap.SimpleEntry(cNextHopClass, key);
+                        SimpleNlriRegistry.this.nextHopSerializers.remove(nhKey);
                         for (final Class<? extends CNextHop> cNextHop : cNextHopClassList) {
-                            SimpleNlriRegistry.this.nextHopSerializers.remove(cNextHop);
+                            final Map.Entry<Class<? extends CNextHop>, BgpTableType> nhKeys = new AbstractMap.SimpleEntry(cNextHop, key);
+                            SimpleNlriRegistry.this.nextHopSerializers.remove(nhKeys);
                         }
                     }
                 }