diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-05-28 04:39:18 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-05-28 04:39:18 +0000 |
commit | f278315081b24b59bf73e9613e552e3519200a71 (patch) | |
tree | cdfe0e8d00e2c3e8002284c4541429f91cb66e68 /sca-cpp/trunk/components/filedb/filedb.hpp | |
parent | c3eb9d1e20e1f8a7a101854d6a883692cac4e8d0 (diff) |
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
Diffstat (limited to 'sca-cpp/trunk/components/filedb/filedb.hpp')
-rw-r--r-- | sca-cpp/trunk/components/filedb/filedb.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sca-cpp/trunk/components/filedb/filedb.hpp b/sca-cpp/trunk/components/filedb/filedb.hpp index ea7638320f..a7151eade1 100644 --- a/sca-cpp/trunk/components/filedb/filedb.hpp +++ b/sca-cpp/trunk/components/filedb/filedb.hpp @@ -125,7 +125,7 @@ const failable<bool> write(const value& v, ostream& os, const string& format) { if (format == "xml") { failable<list<string> > s = writeXML(valuesToElements(v)); if (!hasContent(s)) - return mkfailure<bool>(reason(s)); + return mkfailure<bool>(s); write(content(s), os); return true; } @@ -133,7 +133,7 @@ const failable<bool> write(const value& v, ostream& os, const string& format) { js::JSContext jscx; failable<list<string> > s = json::writeJSON(valuesToElements(v), jscx); if (!hasContent(s)) - return mkfailure<bool>(reason(s)); + return mkfailure<bool>(s); write(content(s), os); return true; } @@ -155,7 +155,7 @@ const failable<value> read(istream& is, const string& format) { js::JSContext jscx; const failable<list<value> > fv = json::readJSON(streamList(is), jscx); if (!hasContent(fv)) - return mkfailure<value>(reason(fv)); + return mkfailure<value>(fv); const value v = elementsToValues(content(fv)); return v; } @@ -223,7 +223,7 @@ const failable<value> get(const value& key, FileDB& db) { if (is.fail()) { ostringstream os; os << "Couldn't get file database entry: " << key; - return mkfailure<value>(str(os)); + return mkfailure<value>(str(os), 404, false); } const failable<value> val = read(is, db.format); |