diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-03-29 12:32:59 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-03-29 12:32:59 -0700 |
| commit | 57b5a33fbbbaceb7ac562145712a435fcd2b1a0a (patch) | |
| tree | 0332b79df47774f38cb3c14c62f7083889c0950f /controller | |
| parent | 3f4f7145a3814bf5e3250208186d55a1def2b3f2 (diff) | |
| download | infinitytier-57b5a33fbbbaceb7ac562145712a435fcd2b1a0a.tar.gz infinitytier-57b5a33fbbbaceb7ac562145712a435fcd2b1a0a.zip | |
Fix bug preventing default from being set to null if already set to an integer.
Diffstat (limited to 'controller')
| -rw-r--r-- | controller/EmbeddedNetworkController.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp index ce56e906..3be55d8e 100644 --- a/controller/EmbeddedNetworkController.cpp +++ b/controller/EmbeddedNetworkController.cpp @@ -1018,9 +1018,10 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST( json ntag = json::object(); const uint64_t tagId = OSUtils::jsonInt(tag["id"],0ULL); 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; } } |