X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fvom%2Fvom%2Fgbp_bridge_domain.cpp;h=d9ea4876a656e6dc2a029a0dffb842f0a890f874;hb=refs%2Fchanges%2F47%2F16547%2F2;hp=953c40c1c290a40a68485f18b87dac0a661fc154;hpb=f34597fc86c64d054073bf614761beea020c2244;p=vpp.git

diff --git a/extras/vom/vom/gbp_bridge_domain.cpp b/extras/vom/vom/gbp_bridge_domain.cpp
index 953c40c1c29..d9ea4876a65 100644
--- a/extras/vom/vom/gbp_bridge_domain.cpp
+++ b/extras/vom/vom/gbp_bridge_domain.cpp
@@ -136,12 +136,9 @@ void
 gbp_bridge_domain::replay()
 {
   if (rc_t::OK == m_id.rc()) {
-    if (m_bvi && m_uu_fwd)
-      HW::enqueue(new gbp_bridge_domain_cmds::create_cmd(m_id, m_bvi->handle(),
-                                                         m_uu_fwd->handle()));
-    else
-      HW::enqueue(new gbp_bridge_domain_cmds::create_cmd(
-        m_id, handle_t::INVALID, handle_t::INVALID));
+    HW::enqueue(new gbp_bridge_domain_cmds::create_cmd(
+      m_id, (m_bvi ? m_bvi->handle() : handle_t::INVALID),
+      (m_uu_fwd ? m_uu_fwd->handle() : handle_t::INVALID)));
   }
 }
 
@@ -182,12 +179,9 @@ gbp_bridge_domain::update(const gbp_bridge_domain& desired)
    * the desired state is always that the interface should be created
    */
   if (rc_t::OK != m_id.rc()) {
-    if (m_bvi && m_uu_fwd)
-      HW::enqueue(new gbp_bridge_domain_cmds::create_cmd(m_id, m_bvi->handle(),
-                                                         m_uu_fwd->handle()));
-    else
-      HW::enqueue(new gbp_bridge_domain_cmds::create_cmd(
-        m_id, handle_t::INVALID, handle_t::INVALID));
+    HW::enqueue(new gbp_bridge_domain_cmds::create_cmd(
+      m_id, (m_bvi ? m_bvi->handle() : handle_t::INVALID),
+      (m_uu_fwd ? m_uu_fwd->handle() : handle_t::INVALID)));
   }
 }