Rev 2369: Use the right lock object. in http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/locking

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/locking

------------------------------------------------------------
revno: 2369
revision-id: john at arbash-meinel.com-20070315191520-3ogywmtl6v5gop7q
parent: john at arbash-meinel.com-20070315185559-xtb5q6p8ldl2mvs1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 13:15:20 -0600
message:
  Use the right lock object.
modified:
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
-------------- next part --------------
=== modified file 'bzrlib/dirstate.py'
--- a/bzrlib/dirstate.py	2007-03-15 18:55:59 +0000
+++ b/bzrlib/dirstate.py	2007-03-15 19:15:20 +0000
@@ -1713,7 +1713,7 @@
                 self._dirblock_state = DirState.IN_MEMORY_UNMODIFIED
             finally:
                 if grabbed_write_lock:
-                    self._lock_token = wlock.restore_read_lock()
+                    self._lock_token = self._lock_token.restore_read_lock()
                     self._state_file = self._lock_token.f
                     # TODO: jam 20070315 We should validate the disk file has
                     #       not changed contents. Since restore_read_lock may