[elephant-cvs] CVS update: elephant/src/utils.lisp

[blee at common-lisp.net]

Update of /project/elephant/cvsroot/elephant/src
In directory common-lisp.net:/tmp/cvs-serv31364/src

Modified Files:
	utils.lisp 
Log Message:
nested transactions are borking -- kword default to
with-transactions should be '*current-transaction*, not
*current-transaction* -- i want to capture the dynamic, not
lexical environment

Date: Thu Sep  2 16:47:31 2004
Author: blee

Index: elephant/src/utils.lisp
diff -u elephant/src/utils.lisp:1.3 elephant/src/utils.lisp:1.4
--- elephant/src/utils.lisp:1.3	Thu Sep  2 09:21:45 2004
+++ elephant/src/utils.lisp	Thu Sep  2 16:47:31 2004
@@ -123,9 +123,10 @@
 (defmacro with-transaction ((&key transaction 
 				  (environment (controller-environment
 						*store-controller*))
-				  (parent *current-transaction*)
+				  (parent '*current-transaction*)
 				  dirty-read txn-nosync
-				  txn-nowait txn-sync)
+				  txn-nowait txn-sync
+				  (retries 100))
 			    &body body)
   `(sleepycat:with-transaction (:transaction ,transaction
 				:environment ,environment
@@ -133,7 +134,8 @@
 				:dirty-read ,dirty-read
 				:txn-nosync ,txn-nosync
 				:txn-nowait ,txn-nowait
-				:txn-sync ,txn-sync)
+				:txn-sync ,txn-sync
+				:retries ,100)
     , at body))