From f278315081b24b59bf73e9613e552e3519200a71 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Mon, 28 May 2012 04:39:18 +0000 Subject: Improve error reporting with a reason code. Improve debug and audit logging. Fix test scripts to cleanup state from previous builds and correctly report test errors. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1343138 13f79535-47bb-0310-9956-ffa450edef68 --- sca-cpp/trunk/modules/json/json.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sca-cpp/trunk/modules/json/json.hpp') diff --git a/sca-cpp/trunk/modules/json/json.hpp b/sca-cpp/trunk/modules/json/json.hpp index 39c56b6863..85579c1b28 100644 --- a/sca-cpp/trunk/modules/json/json.hpp +++ b/sca-cpp/trunk/modules/json/json.hpp @@ -72,7 +72,7 @@ const failable > readJSON(const list& ilist, const js::JSCon if(!JS_FinishJSONParse(cx, parser, JSVAL_NULL)) return mkfailure >("JS_FinishJSONParse failed"); if(!hasContent(consumed)) - return mkfailure >(reason(consumed)); + return mkfailure >(consumed); return list(js::jsValToValue(val, cx)); } @@ -149,7 +149,7 @@ const failable > jsonResult(const value& id, const value& val, js:: const failable jsonResultValue(const list& s, js::JSContext& cx) { const failable > jsres = json::readJSON(s, cx); if (!hasContent(jsres)) - return mkfailure(reason(jsres)); + return mkfailure(jsres); const list rval(cadr(elementsToValues(content(jsres)))); const value val = cadr(rval); if (isList(val) && !js::isJSArray(val)) -- cgit v1.2.3