https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112867
Revision: 112867
Author: aaron
Date: 2012-03-02 01:35:26 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
MFT r112866
Modified Paths:
--------------
branches/wmf/1.19wmf1/includes/filerepo/backend/lockmanager/LockManager.php
Property Changed:
----------------
branches/wmf/1.19wmf1/
branches/wmf/1.19wmf1/includes/
Property changes on: branches/wmf/1.19wmf1
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111427,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169-112170,112172-112173,112179,112184,112259,112290,112347,112374,112378,112381,112383,112397,112408,112474,112526,112533-112534,112563,112566,112700,112750,112839-112840,112843
+ /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111427,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169-112170,112172-112173,112179,112184,112259,112290,112347,112374,112378,112381,112383,112397,112408,112474,112526,112533-112534,112563,112566,112700,112750,112839-112840,112843,112866
Property changes on: branches/wmf/1.19wmf1/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111427,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133,112152,112184,112259,112290,112347,112374,112378,112381,112383,112397,112408,112474,112526,112534,112563,112700,112839-112840,112843
+ /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111427,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133,112152,112184,112259,112290,112347,112374,112378,112381,112383,112397,112408,112474,112526,112534,112563,112700,112839-112840,112843,112866
Modified:
branches/wmf/1.19wmf1/includes/filerepo/backend/lockmanager/LockManager.php
===================================================================
--- branches/wmf/1.19wmf1/includes/filerepo/backend/lockmanager/LockManager.php
2012-03-02 01:34:06 UTC (rev 112866)
+++ branches/wmf/1.19wmf1/includes/filerepo/backend/lockmanager/LockManager.php
2012-03-02 01:35:26 UTC (rev 112867)
@@ -56,7 +56,10 @@
* @return Status
*/
final public function lock( array $paths, $type = self::LOCK_EX ) {
- return $this->doLock( array_unique( $paths ),
$this->lockTypeMap[$type] );
+ wfProfileIn( __METHOD__ );
+ $status = $this->doLock( array_unique( $paths ),
$this->lockTypeMap[$type] );
+ wfProfileOut( __METHOD__ );
+ return $status;
}
/**
@@ -67,7 +70,10 @@
* @return Status
*/
final public function unlock( array $paths, $type = self::LOCK_EX ) {
- return $this->doUnlock( array_unique( $paths ),
$this->lockTypeMap[$type] );
+ wfProfileIn( __METHOD__ );
+ $status = $this->doUnlock( array_unique( $paths ),
$this->lockTypeMap[$type] );
+ wfProfileOut( __METHOD__ );
+ return $status;
}
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
