[elephant-cvs] CVS elephant/src/elephant

[ieslick]

Update of /project/elephant/cvsroot/elephant/src/elephant
In directory clnet:/tmp/cvs-serv21337/src/elephant

Modified Files:
	collections.lisp serializer2.lisp 
Log Message:
Fix condition handler; map-index error checking

--- /project/elephant/cvsroot/elephant/src/elephant/collections.lisp	2007/04/23 02:26:53	1.23
+++ /project/elephant/cvsroot/elephant/src/elephant/collections.lisp	2007/04/23 02:41:11	1.24
@@ -415,7 +415,7 @@
 (defmethod map-index (fn (index btree-index) &rest args &key start end (value nil value-set-p) from-end)
   (declare (dynamic-extent args)
 	   (ignorable args))
-  (unless (lisp-compare<= start end)
+  (unless (or (null start) (null end) (lisp-compare<= start end))
     (error "map-index called with start = ~A and end = ~A. Start must be less than or equal to end according to elephant::lisp-compare<=."
 	   start end))
   (let ((sc (get-con index))
--- /project/elephant/cvsroot/elephant/src/elephant/serializer2.lisp	2007/04/22 03:35:09	1.40
+++ /project/elephant/cvsroot/elephant/src/elephant/serializer2.lisp	2007/04/23 02:41:11	1.41
@@ -201,7 +201,7 @@
 	      (serialize-string frob bs))
 	     (persistent
 	      (unless (valid-persistent-reference-p frob sc)
-		(raise-cross-store-condition frob sc))
+		(signal-cross-reference-error frob sc))
 	      (buffer-write-byte +persistent+ bs)
 	      (buffer-write-int32 (oid frob) bs)
 	      ;; This circumlocution is necessitated by