Fixed JsonObject not inserting keys of type String (fixes bblanchon#782)

bblanchon · bblanchon · commit 6e4f1dc7569a · 2018-07-17T10:24:21.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 ArduinoJson: change log
 =======================
 
+HEAD
+----
+
+* Fixed `JsonObject` not inserting keys of type `String` (issue #782)
+
 v6.2.0-beta
 -----------
 
diff --git a/src/ArduinoJson/Strings/ArduinoString.hpp b/src/ArduinoJson/Strings/ArduinoString.hpp
@@ -15,7 +15,7 @@ class ArduinoString {
 
   template <typename Buffer>
   const char* save(Buffer* buffer) const {
-    if (!_str->c_str()) return NULL;  // <- Arduino string can return NULL
+    if (is_null()) return NULL;
     size_t n = _str->length() + 1;
     void* dup = buffer->alloc(n);
     if (dup != NULL) memcpy(dup, _str->c_str(), n);
@@ -24,7 +24,7 @@ class ArduinoString {
 
   bool is_null() const {
     // Arduino's String::c_str() can return NULL
-    return _str->c_str();
+    return !_str->c_str();
   }
 
   bool equals(const char* expected) const {
