From 88369ba6ebd585f5e4b3c61163adbc4a42f24ecb Mon Sep 17 00:00:00 2001
From: Ananth Suryanarayana <anantha@juniper.net>
Date: Tue, 11 Oct 2016 11:56:20 -0700
Subject: [PATCH] Convert pointer to bool correctly

Also remove default in the switch and cover all cases explicitly

Change-Id: I0fdb4d440bb4067a35519ea2af1cd75cc52ec242
Partial-Bug: #1602347
---
 src/bgp/ermvpn/ermvpn_route.cc | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/bgp/ermvpn/ermvpn_route.cc b/src/bgp/ermvpn/ermvpn_route.cc
index b6ffde2cc8c..62459ce9ce3 100644
--- a/src/bgp/ermvpn/ermvpn_route.cc
+++ b/src/bgp/ermvpn/ermvpn_route.cc
@@ -277,15 +277,12 @@ bool ErmVpnRoute::IsValid() const {
     const BgpAttr *attr = BestPath()->GetAttr();
     switch (prefix_.type()) {
     case ErmVpnPrefix::NativeRoute:
-        return attr->label_block();
-        break;
+        return attr->label_block().get() != NULL;
     case ErmVpnPrefix::LocalTreeRoute:
-        return attr->edge_discovery();
-        break;
+        return attr->edge_discovery() != NULL;
     case ErmVpnPrefix::GlobalTreeRoute:
-        return attr->edge_forwarding();
-        break;
-    default:
+        return attr->edge_forwarding() != NULL;
+    case ErmVpnPrefix::Invalid:
         break;
     }