| Index: branches/FileBackend/phase3/includes/filerepo/backend/FileBackend.php |
| — | — | @@ -218,7 +218,7 @@ |
| 219 | 219 | * @return Status |
| 220 | 220 | */ |
| 221 | 221 | final public function lockFiles( array $paths ) { |
| 222 | | - return $this->lockManager->lock( $this->getLockResourcePaths( $paths ) ); |
| | 222 | + return $this->lockManager->lock( $paths ); |
| 223 | 223 | } |
| 224 | 224 | |
| 225 | 225 | /** |
| — | — | @@ -229,23 +229,8 @@ |
| 230 | 230 | * @return Status |
| 231 | 231 | */ |
| 232 | 232 | final public function unlockFiles( array $paths ) { |
| 233 | | - return $this->lockManager->unlock( $this->getLockResourcePaths( $paths ) ); |
| | 233 | + return $this->lockManager->unlock( $paths ); |
| 234 | 234 | } |
| 235 | | - |
| 236 | | - /** |
| 237 | | - * Prefix a list of storage paths to use as resource paths to lock |
| 238 | | - * |
| 239 | | - * @param $paths Array |
| 240 | | - * @return Array |
| 241 | | - */ |
| 242 | | - private function getLockResourcePaths( array $paths ) { |
| 243 | | - $backendKey = get_class( $this ) . ':' . $this->getName(); |
| 244 | | - $res = array(); |
| 245 | | - foreach( $paths as $path ) { |
| 246 | | - $res[] = "{$backendKey}:{$path}"; |
| 247 | | - } |
| 248 | | - return $res; |
| 249 | | - } |
| 250 | 235 | } |
| 251 | 236 | |
| 252 | 237 | /** |
| — | — | @@ -354,7 +339,7 @@ |
| 355 | 340 | } |
| 356 | 341 | |
| 357 | 342 | /** |
| 358 | | - * Split a storage path (e.g. "mwstore://container/path/to/object") |
| | 343 | + * Split a storage path (e.g. "mwstore://backend/container/path/to/object") |
| 359 | 344 | * into a container name and a full object name within that container. |
| 360 | 345 | * |
| 361 | 346 | * @param $storagePath string |