From e391fcd87dfb35f47da3a443f1f3e49d004e3032 Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Mon, 8 Dec 2014 16:19:15 +0100
Subject: [PATCH] Bug 2492: LinkstateAdjRIBsIn.removeRoutes accepts null
 routes.

http://tools.ietf.org/html/rfc4760#section-4
does not explicitly forbid MP_UNREACH_NLRI without any
Withdrawn Routes in it, so if statement is added
to handle withdrawnRoutes == null case.
(Patch compiles, but misses a unit test.)

Change-Id: Ie880f9c81d6a3773e4b33dea164d8bab3b6ee248
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---
 .../protocol/bgp/linkstate/LinkstateAdjRIBsIn.java        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsIn.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsIn.java
index 80df0203c2..2811608843 100644
--- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsIn.java
+++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsIn.java
@@ -213,8 +213,12 @@ final class LinkstateAdjRIBsIn extends AbstractAdjRIBs<CLinkstateDestination, Li
 
     @Override
     public void removeRoutes(final AdjRIBsTransaction trans, final Peer peer, final MpUnreachNlri nlri) {
-        final DestinationLinkstate keys = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.update.path.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationLinkstateCase) nlri.getWithdrawnRoutes().getDestinationType()).getDestinationLinkstate();
-
+        final WithdrawnRoutes withdrawnRoutes = nlri.getWithdrawnRoutes();
+        if (withdrawnRoutes == null) {
+            LOG.debug("Got Multiprotocol Unreachable NLRI without any routes to withdraw. Ignoring it: {}", nlri);
+            return;
+        }
+        final DestinationLinkstate keys = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.update.path.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationLinkstateCase) withdrawnRoutes.getDestinationType()).getDestinationLinkstate();
         for (final CLinkstateDestination key : keys.getCLinkstateDestination()) {
             super.remove(trans, peer, key);
         }
-- 
2.36.6