symfony
diff --git a/‎src/Symfony/Component/Lock/Store/PdoStore.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Lock/Store/PdoStore.php
+6-10Lines changed: 6 additions & 10 deletions b/‎src/Symfony/Component/Lock/Store/PdoStore.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Lock/Store/PdoStore.php
+6-10Lines changed: 6 additions & 10 deletions
diff --git a/‎src/Symfony/Component/Lock/Store/ZookeeperStore.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Lock/Store/ZookeeperStore.php
+4Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/Lock/Store/ZookeeperStore.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Lock/Store/ZookeeperStore.php
+4Lines changed: 4 additions & 0 deletions
@@ -36,6 +36,8 @@
  */
 class PdoStore implements StoreInterface
 {
+    use ExpiringStoreTrait;
+
     private $conn;
     private $dsn;
     private $driver;
@@ -123,9 +125,7 @@ public function save(Key $key)
 
         try {
             $stmt->execute();
-            if ($key->isExpired()) {
-                throw new LockExpiredException(sprintf('Failed to put off the expiration of the "%s" lock within the specified time.', $key));
-            }
+            $this->checkNotExpired($key);
 
             return;
         } catch (DBALException $e) {
@@ -136,13 +136,11 @@ public function save(Key $key)
             $this->putOffExpiration($key, $this->initialTtl);
         }
 
-        if ($key->isExpired()) {
-            throw new LockExpiredException(sprintf('Failed to store the "%s" lock.', $key));
-        }
-
         if ($this->gcProbability > 0 && (1.0 === $this->gcProbability || (random_int(0, PHP_INT_MAX) / PHP_INT_MAX) <= $this->gcProbability)) {
             $this->prune();
         }
+
+        $this->checkNotExpired($key);
     }
 
     /**
@@ -178,9 +176,7 @@ public function putOffExpiration(Key $key, $ttl)
             throw new LockConflictedException();
         }
 
-        if ($key->isExpired()) {
-            throw new LockExpiredException(sprintf('Failed to put off the expiration of the "%s" lock within the specified time.', $key));
-        }
+        $this->checkNotExpired($key);
     }
 
     /**
 
@@ -25,6 +25,8 @@
  */
 class ZookeeperStore implements StoreInterface
 {
+    use ExpiringStoreTrait;
+
     private $zookeeper;
 
     public function __construct(\Zookeeper $zookeeper)
@@ -45,6 +47,8 @@ public function save(Key $key)
         $token = $this->getUniqueToken($key);
 
         $this->createNewLock($resource, $token);
+
+        $this->checkNotExpired($key);
     }
 
     /**