From a3462d0fa7b8d466def27dd8bb3dcbf720f35bd5 Mon Sep 17 00:00:00 2001
From: Jon Meredith <jmeredith@thehive.com>
Date: Fri, 29 May 2009 13:45:58 -0600
Subject: [PATCH] txn_abort() used to return ok even if no txn.  The error code
 changes broke that behavior.  Changed it to return ok if there was no txn.

---
 src/bdberl.erl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/bdberl.erl b/src/bdberl.erl
index 35bd6ae..e6b2451 100644
--- a/src/bdberl.erl
+++ b/src/bdberl.erl
@@ -463,6 +463,7 @@ txn_abort() ->
         ok ->
             receive
                 ok -> ok;
+                {error, no_txn} -> ok;
                 {error, Reason} -> {error, decode_rc(Reason)}
             end;
 
@@ -540,13 +541,14 @@ transaction(Fun, Retries) ->
     {ok, db_value()} | db_txn_error().
 
 transaction(_Fun, 0, _Opts) ->
-    ok = txn_abort(),
     {error, {transaction_failed, retry_limit_reached}};
+
 transaction(Fun, Retries, Opts) ->
     case txn_begin(Opts) of
         ok ->
             try Fun() of
                 abort ->
+                    error_logger:info_msg("function requested abort"),
                     ok = txn_abort(),
                     {error, transaction_aborted};
 
@@ -566,6 +568,7 @@ transaction(Fun, Retries, Opts) ->
                     transaction(Fun, R);
 
                 _ : Reason ->
+                    error_logger:info_msg("function threw non-lock error - ~p", [Reason]),
                     ok = txn_abort(),
                     {error, {transaction_failed, Reason}}
             end;