| Index: branches/wmf/1.19wmf1/includes/filerepo/backend/lockmanager/LockManager.php |
| — | — | @@ -56,7 +56,10 @@ |
| 57 | 57 | * @return Status |
| 58 | 58 | */ |
| 59 | 59 | final public function lock( array $paths, $type = self::LOCK_EX ) { |
| 60 | | - return $this->doLock( array_unique( $paths ), $this->lockTypeMap[$type] ); |
| | 60 | + wfProfileIn( __METHOD__ ); |
| | 61 | + $status = $this->doLock( array_unique( $paths ), $this->lockTypeMap[$type] ); |
| | 62 | + wfProfileOut( __METHOD__ ); |
| | 63 | + return $status; |
| 61 | 64 | } |
| 62 | 65 | |
| 63 | 66 | /** |
| — | — | @@ -67,7 +70,10 @@ |
| 68 | 71 | * @return Status |
| 69 | 72 | */ |
| 70 | 73 | final public function unlock( array $paths, $type = self::LOCK_EX ) { |
| 71 | | - return $this->doUnlock( array_unique( $paths ), $this->lockTypeMap[$type] ); |
| | 74 | + wfProfileIn( __METHOD__ ); |
| | 75 | + $status = $this->doUnlock( array_unique( $paths ), $this->lockTypeMap[$type] ); |
| | 76 | + wfProfileOut( __METHOD__ ); |
| | 77 | + return $status; |
| 72 | 78 | } |
| 73 | 79 | |
| 74 | 80 | /** |
| Property changes on: branches/wmf/1.19wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 75 | 81 | Merged /trunk/phase3/includes:r112866 |
| Property changes on: branches/wmf/1.19wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 76 | 82 | Merged /trunk/phase3:r112866 |