commit 56356b213401f96f4811607f580c6376a753ba5d
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jul 18 16:56:34 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jul 18 17:33:50 2014 -0700
tree 651e0f7a98b622004e19aa03e03169dc07d2c3d2
parent f67cf0899c51246abf5ead2a171a2c044df264b5

rib: Fixing bug with RibUnregister when route origin is not specified

Change-Id: Ica250a1c45ed42f1dc7862a12916f893fa846312
Refs: #1773

rib/rib-manager.cpp

diff --git a/rib/rib-manager.cpp b/rib/rib-manager.cpp
index d9c88e2..953703b 100644
--- a/rib/rib-manager.cpp
+++ b/rib/rib-manager.cpp
@@ -264,8 +264,10 @@
   //so passing only the required arguments.
   ControlParameters parameters;
   parameters.setName(params.getName());
-  parameters.setFaceId(params.getFaceId());
-  parameters.setOrigin(params.getOrigin());
+  if (params.hasFaceId())
+    parameters.setFaceId(params.getFaceId());
+  if (params.hasOrigin())
+    parameters.setOrigin(params.getOrigin());
 
   if (!validateParameters(command, parameters))
     {