diff options
Diffstat (limited to 'sca-cpp/trunk/components/kvdb')
-rwxr-xr-x | sca-cpp/trunk/components/kvdb/kvdb-test | 1 | ||||
-rw-r--r-- | sca-cpp/trunk/components/kvdb/kvdb.cpp | 8 | ||||
-rw-r--r-- | sca-cpp/trunk/components/kvdb/leveldb.hpp | 3 | ||||
-rwxr-xr-x | sca-cpp/trunk/components/kvdb/server-test | 1 |
4 files changed, 7 insertions, 6 deletions
diff --git a/sca-cpp/trunk/components/kvdb/kvdb-test b/sca-cpp/trunk/components/kvdb/kvdb-test index 3730ed67a4..420b98559c 100755 --- a/sca-cpp/trunk/components/kvdb/kvdb-test +++ b/sca-cpp/trunk/components/kvdb/kvdb-test @@ -18,6 +18,7 @@ # under the License. # Setup +rm -rf tmp mkdir -p tmp ./tinycdb -c -m tmp/test.cdb </dev/null diff --git a/sca-cpp/trunk/components/kvdb/kvdb.cpp b/sca-cpp/trunk/components/kvdb/kvdb.cpp index bab4e5d82b..24a2fb5a16 100644 --- a/sca-cpp/trunk/components/kvdb/kvdb.cpp +++ b/sca-cpp/trunk/components/kvdb/kvdb.cpp @@ -48,7 +48,7 @@ const failable<value> post(const list<value>& params, leveldb::LevelDB& cdb) { const value id = append<value>(car(params), mklist(mkuuid())); const failable<bool> val = leveldb::post(id, cadr(params), cdb); if (!hasContent(val)) - return mkfailure<value>(reason(val)); + return mkfailure<value>(val); return id; } @@ -58,7 +58,7 @@ const failable<value> post(const list<value>& params, leveldb::LevelDB& cdb) { const failable<value> put(const list<value>& params, leveldb::LevelDB& cdb) { const failable<bool> val = leveldb::put(car(params), cadr(params), cdb); if (!hasContent(val)) - return mkfailure<value>(reason(val)); + return mkfailure<value>(val); return value(content(val)); } @@ -68,7 +68,7 @@ const failable<value> put(const list<value>& params, leveldb::LevelDB& cdb) { const failable<value> del(const list<value>& params, leveldb::LevelDB& cdb) { const failable<bool> val = leveldb::del(car(params), cdb); if (!hasContent(val)) - return mkfailure<value>(reason(val)); + return mkfailure<value>(val); return value(content(val)); } @@ -90,7 +90,7 @@ public: return put(cdr(params), cdb); if (func == "delete") return del(cdr(params), cdb); - return tuscany::mkfailure<tuscany::value>(); + return mkfailure<value>(); } private: diff --git a/sca-cpp/trunk/components/kvdb/leveldb.hpp b/sca-cpp/trunk/components/kvdb/leveldb.hpp index b26cde73fe..8105f86ec4 100644 --- a/sca-cpp/trunk/components/kvdb/leveldb.hpp +++ b/sca-cpp/trunk/components/kvdb/leveldb.hpp @@ -157,8 +157,7 @@ const failable<int> dbopen(LevelDB& db) { struct stat st; const int s = stat(c_str(db.name), &st); if (s == -1) - return mkfailure<int>( - string("Couldn't leveldb read database stat: ") + db.name); + return mkfailure<int>(string("Couldn't leveldb read database stat: ") + db.name); leveldb::DB* ldb; leveldb::Options options; diff --git a/sca-cpp/trunk/components/kvdb/server-test b/sca-cpp/trunk/components/kvdb/server-test index 1836336c70..ebf01b9b4b 100755 --- a/sca-cpp/trunk/components/kvdb/server-test +++ b/sca-cpp/trunk/components/kvdb/server-test @@ -18,6 +18,7 @@ # under the License. # Setup +rm -rf tmp ../../modules/http/httpd-conf tmp localhost 8090 ../../modules/http/htdocs ../../modules/server/server-conf tmp ../../modules/server/scheme-conf tmp |