Fixed awaiting void futures

GeorgeSapkin · Feb 9, 2015 · 77fe196 · 77fe196
1 parent d5f6670
commit 77fe196
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/source/fdb/future.d b/source/fdb/future.d
@@ -153,6 +153,8 @@ shared class FDBFutureBase(C, V) : FutureBase!V, IDisposable
 
         static if (!is(V == void))
             value = cast(shared)extractValue(fh, err);
+        else
+            extractValue(fh, err);
 
         exception = cast(shared)err.toException;
 

diff --git a/source/fdb/main.d b/source/fdb/main.d
@@ -1,18 +1,14 @@
 module fdb.main;
 
 import
-    std.array,
     std.concurrency,
-    std.conv,
     std.exception,
-    std.format,
     std.string;
 
 import
     fdb.cluster,
     fdb.error,
     fdb.fdb_c,
-    fdb.fdb_c_options,
     fdb.future,
     fdb.networkoptions;
 

diff --git a/source/fdb/transaction.d b/source/fdb/transaction.d
@@ -159,13 +159,9 @@ shared class Transaction : IDatabaseContext, IDisposable, IReadOnlyTransaction
         // cancel, commit and reset are mutually exclusive
         synchronized (this)
         {
-            auto fh = fdb_transaction_commit(cast(TransactionHandle)th);
-
-            auto err = fdb_future_block_until_ready(fh);
-            enforceError(err);
-
-            err = fdb_future_get_error(fh);
-            enforceError(err);
+            auto fh     = fdb_transaction_commit(cast(TransactionHandle)th);
+            auto future = createFuture!VoidFuture(fh, this);
+            future.await;
         }
     }