4 files changed, 10 insertions, 8 deletions
diff --git a/sca-cpp/trunk/components/constdb/constdb-test b/sca-cpp/trunk/components/constdb/constdb-test
index 3730ed67a4..420b98559c 100755
--- a/sca-cpp/trunk/components/constdb/constdb-test
+++ b/sca-cpp/trunk/components/constdb/constdb-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/constdb/constdb.cpp b/sca-cpp/trunk/components/constdb/constdb.cpp
index 94df433a67..c3b9d63284 100644
--- a/sca-cpp/trunk/components/constdb/constdb.cpp
+++ b/sca-cpp/trunk/components/constdb/constdb.cpp
@@ -48,7 +48,7 @@ const failable<value> post(const list<value>& params, tinycdb::TinyCDB& cdb) {
     const value id = append<value>(car(params), mklist(mkuuid()));
     const failable<bool> val = tinycdb::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, tinycdb::TinyCDB& cdb) {
 const failable<value> put(const list<value>& params, tinycdb::TinyCDB& cdb) {
     const failable<bool> val = tinycdb::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, tinycdb::TinyCDB& cdb) {
 const failable<value> del(const list<value>& params, tinycdb::TinyCDB& cdb) {
     const failable<bool> val = tinycdb::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/constdb/server-test b/sca-cpp/trunk/components/constdb/server-test
index 7e98e42bbb..abeceaf98e 100755
--- a/sca-cpp/trunk/components/constdb/server-test
+++ b/sca-cpp/trunk/components/constdb/server-test
@@ -18,6 +18,7 @@
 #  under the License.
 
 # Setup
+rm -rf tmp
 ../../modules/http/httpd-conf tmp localhost 8090 ../../modules/http/htdocs
 ../../modules/http/httpd-event-conf tmp
 ../../modules/server/server-conf tmp
diff --git a/sca-cpp/trunk/components/constdb/tinycdb.hpp b/sca-cpp/trunk/components/constdb/tinycdb.hpp
index 02114cf1ae..c7d4cf520b 100644
--- a/sca-cpp/trunk/components/constdb/tinycdb.hpp
+++ b/sca-cpp/trunk/components/constdb/tinycdb.hpp
@@ -222,7 +222,7 @@ const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsi
     // Open existing db
     failable<int> ffd = cdbopen(cdb);
     if (!hasContent(ffd))
-        return mkfailure<bool>(reason(ffd));
+        return mkfailure<bool>(ffd);
     const int fd = content(ffd);
 
     // Read the db header
@@ -307,7 +307,7 @@ const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsi
     cdbclose(cdb);
     failable<int> ffd = cdbopen(cdb);
     if (!hasContent(ffd))
-        return mkfailure<bool>(reason(ffd));
+        return mkfailure<bool>(ffd);
 
     return true;
 }
@@ -413,7 +413,7 @@ const failable<value> get(const value& key, TinyCDB& cdb) {
 
     const failable<int> ffd = cdbopen(cdb);
     if (!hasContent(ffd))
-        return mkfailure<value>(reason(ffd));
+        return mkfailure<value>(ffd);
     const int fd = content(ffd);
 
     const string ks(scheme::writeValue(key));
@@ -422,7 +422,7 @@ const failable<value> get(const value& key, TinyCDB& cdb) {
     if (cdb_seek(fd, c_str(ks), (unsigned int)length(ks), &vlen) <= 0) {
         ostringstream os;
         os << "Couldn't get tinycdb entry: " << key;
-        return mkfailure<value>(str(os));
+        return mkfailure<value>(str(os), 404, false);
     }
     char* data = gc_cnew(vlen + 1);
     cdb_bread(fd, data, vlen);