CRM-16387 - CRM_Core_Lock - Only use `static` hacking on locks that are acquired.

diff --git a/CRM/Core/Lock.php b/CRM/Core/Lock.php
index 7dcfaa5c0c6e9aa8d581538bcfb2e584e453753b..9c28de7fd244888d99a7451575a423358f7df474 100644 (file)
--- a/CRM/Core/Lock.php
+++ b/CRM/Core/Lock.php
@@ -127,12 +127,6 @@ class CRM_Core_Lock implements \Civi\Core\Lock\LockInterface {
     if (defined('CIVICRM_LOCK_DEBUG')) {
       CRM_Core_Error::debug_log_message('trying to construct lock for ' . $this->_name);
     }
-    if (self::$jobLog && CRM_Core_DAO::singleValueQuery("SELECT IS_USED_LOCK( '" . self::$jobLog . "')")) {
-      return $this->hackyHandleBrokenCode(self::$jobLog);
-    }
-    if (stristr($name, 'data.mailing.job.')) {
-      self::$jobLog = $this->_name;
-    }
     $this->_timeout = $timeout !== NULL ? $timeout : self::TIMEOUT;
   }
 
@@ -145,6 +139,10 @@ class CRM_Core_Lock implements \Civi\Core\Lock\LockInterface {
    */
   public function acquire($timeout = NULL) {
     if (!$this->_hasLock) {
+      if (self::$jobLog && CRM_Core_DAO::singleValueQuery("SELECT IS_USED_LOCK( '" . self::$jobLog . "')")) {
+        return $this->hackyHandleBrokenCode(self::$jobLog);
+      }
+
       $query = "SELECT GET_LOCK( %1, %2 )";
       $params = array(
         1 => array($this->_name, 'String'),
@@ -156,6 +154,9 @@ class CRM_Core_Lock implements \Civi\Core\Lock\LockInterface {
           CRM_Core_Error::debug_log_message('acquire lock for ' . $this->_name);
         }
         $this->_hasLock = TRUE;
+        if (stristr($this->_name, 'data.mailing.job.')) {
+          self::$jobLog = $this->_name;
+        }
       }
       else {
         if (defined('CIVICRM_LOCK_DEBUG')) {