Merge "Convert pointer to bool correctly"

Juniper · Oct 12, 2016 · 1cfc80a · 1cfc80a
2 parents dac7c37 + 88369ba
commit 1cfc80a
Showing 1 changed file with 4 additions and 7 deletions.
diff --git 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;
     }