[Firebird-checkins] CVS: firebird2/src/lock lock.cpp,1.157,1.158

[Dmitry Y. <di...@us...>]

Build Version :  T2.5.0.20320 Firebird 2.5 Alpha 1

(writeBuildNum.sh,v 1.20481 2008/06/12 07:34:54 dimitr Exp  )

Update of /cvsroot/firebird/firebird2/src/lock
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv15388

Modified Files:
	lock.cpp 
Log Message:
Fixed a deadlock which could occur during the shared memory region remapping. This bug has been introduced by myself along with the LM rework.

Index: lock.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/lock/lock.cpp,v
retrieving revision 1.157
retrieving revision 1.158
diff -b -U3 -r1.157 -r1.158
--- lock.cpp	11 Jun 2008 01:41:42 -0000	1.157
+++ lock.cpp	12 Jun 2008 07:34:50 -0000	1.158
@@ -3684,8 +3684,8 @@
 				Database::Checkout dcoHolder(tdbb->getDatabase());
 				ret = ISC_event_wait(1, &event_ptr, &value,
 									 (timeout - current_time) * 1000000);
-			}
 			--m_waitingOwners;
+			}
 			m_localMutex.enter();
 		}