Browse Source

Fix bug preventing default from being set to null if already set to an integer.

Adam Ierymenko 8 years ago
parent
commit
57b5a33fbb
1 changed files with 4 additions and 3 deletions
  1. 4 3
      controller/EmbeddedNetworkController.cpp

+ 4 - 3
controller/EmbeddedNetworkController.cpp

@@ -1018,9 +1018,10 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST(
 									json ntag = json::object();
 									json ntag = json::object();
 									const uint64_t tagId = OSUtils::jsonInt(tag["id"],0ULL);
 									const uint64_t tagId = OSUtils::jsonInt(tag["id"],0ULL);
 									ntag["id"] = tagId;
 									ntag["id"] = tagId;
-									if (tag.find("default") == tag.end())
-										ntag["default"] = json();
-									else ntag["default"] = OSUtils::jsonInt(tag["default"],0ULL);
+									json &dfl = tag["default"];
+									if (dfl.is_null())
+										ntag["default"] = dfl;
+									else ntag["default"] = OSUtils::jsonInt(dfl,0ULL);
 									ntags[tagId] = ntag;
 									ntags[tagId] = ntag;
 								}
 								}
 							}
 							}