Commit 64937bef authored by Jim Fulton's avatar Jim Fulton

history wasn't protected by a lock.

parent 7991e191
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
# may have a back pointer to a version record or to a non-version # may have a back pointer to a version record or to a non-version
# record. # record.
# #
__version__='$Revision: 1.38 $'[11:-2] __version__='$Revision: 1.39 $'[11:-2]
import struct, time, os, bpthread, string, base64, sys import struct, time, os, bpthread, string, base64, sys
from struct import pack, unpack from struct import pack, unpack
...@@ -895,6 +895,8 @@ class FileStorage(BaseStorage.BaseStorage): ...@@ -895,6 +895,8 @@ class FileStorage(BaseStorage.BaseStorage):
return r return r
def history(self, oid, version=None, length=1, filter=None): def history(self, oid, version=None, length=1, filter=None):
self._lock_acquire()
try:
r=[] r=[]
file=self._file file=self._file
seek=file.seek seek=file.seek
...@@ -944,6 +946,7 @@ class FileStorage(BaseStorage.BaseStorage): ...@@ -944,6 +946,7 @@ class FileStorage(BaseStorage.BaseStorage):
if prev: pos=prev if prev: pos=prev
else: return r else: return r
finally: self._lock_release()
def pack(self, t, referencesf): def pack(self, t, referencesf):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment