Mercurial > hg > piper-cpp

diff vamp-json/VampJson.h @ 180:bd543e74a9bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Correct the inspection of the JSON object in successful to look for both error and success objects, writing out an error string if neither are present. Revert error handling in readInput() for JSON.
author Lucas Thompson <dev@lucas.im>
date Fri, 03 Feb 2017 11:12:27 +0000
parents 1990dd9570d8
children 03b067abd91d
line wrap: on
line diff
--- a/vamp-json/VampJson.h	Fri Feb 03 11:09:37 2017 +0000
+++ b/vamp-json/VampJson.h	Fri Feb 03 11:12:27 2017 +0000
@@ -1109,11 +1109,14 @@
 
     static bool
     successful(json11::Json j, std::string &err) {
-        if (!j["result"].is_object()) {
-            err = "result object expected for success";
+        if (j["result"].is_object()) {
+            return true;
+        } else if (j["error"].is_object()) {
+            return false;
+        } else {
+            err = "result or error object required for valid response";
             return false;
         }
-        return true;
     }
 
     static void