commit e87f7ee5ef72540e6c749ca8a49ab307ba720b6f Author: Erik Stielstra Date: Thu Feb 13 16:12:07 2014 +0100 #3 diff --git a/core/lib/Drupal/Core/Config/ConfigImporter.php b/core/lib/Drupal/Core/Config/ConfigImporter.php index 14db995..1e24ed7 100644 --- a/core/lib/Drupal/Core/Config/ConfigImporter.php +++ b/core/lib/Drupal/Core/Config/ConfigImporter.php @@ -35,7 +35,7 @@ class ConfigImporter { /** * The name used to identify the lock. */ - const ID = 'config.importer'; + const LOCKID = 'config_importer'; /** * The storage comparer used to discover configuration changes. @@ -201,9 +201,9 @@ public function import() { // Ensure that the changes have been validated. $this->validate(); - if (!$this->lock->acquire(static::ID)) { + if (!$this->lock->acquire(static::LOCKID)) { // Another process is synchronizing configuration. - throw new ConfigImporterException(sprintf('%s is already importing', static::ID)); + throw new ConfigImporterException(sprintf('%s is already importing', static::LOCKID)); } $this->importInvokeOwner(); $this->importConfig(); @@ -212,7 +212,7 @@ public function import() { // The import is now complete. - $this->lock->release(static::ID); + $this->lock->release(static::LOCKID); $this->reset(); } return $this; @@ -302,17 +302,7 @@ protected function importInvokeOwner() { * TRUE if an import is already running, FALSE if not. */ public function alreadyImporting() { - return !$this->lock->lockMayBeAvailable(static::ID); - } - - /** - * Returns the identifier for events and locks. - * - * @return string - * The identifier for events and locks. - */ - public function getId() { - return static::ID; + return !$this->lock->lockMayBeAvailable(static::LOCKID); } }