dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Update populateRevisionSha1.php for MCR schema changes"
[lhc/web/wiklou.git]
/
includes
/
libs
/
objectcache
/
BagOStuff.php
diff --git
a/includes/libs/objectcache/BagOStuff.php
b/includes/libs/objectcache/BagOStuff.php
index
50441c5
..
7759947
100644
(file)
--- a/
includes/libs/objectcache/BagOStuff.php
+++ b/
includes/libs/objectcache/BagOStuff.php
@@
-590,7
+590,11
@@
abstract class BagOStuff implements IExpiringStore, LoggerAwareInterface {
* @return bool Success
*/
public function unlock( $key ) {
* @return bool Success
*/
public function unlock( $key ) {
- if ( isset( $this->locks[$key] ) && --$this->locks[$key]['depth'] <= 0 ) {
+ if ( !isset( $this->locks[$key] ) ) {
+ return false;
+ }
+
+ if ( --$this->locks[$key]['depth'] <= 0 ) {
unset( $this->locks[$key] );
$ok = $this->doDelete( "{$key}:lock" );
unset( $this->locks[$key] );
$ok = $this->doDelete( "{$key}:lock" );