Merge branch 'MC-34211' into MC-33275-2

vzabaznov · vzabaznov · commit 7febc1d72435 · 2020-05-14T13:36:22.000-05:00
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Cache.php b/lib/internal/Magento/Framework/Lock/Backend/Cache.php
@@ -55,7 +55,8 @@ public function lock(string $name, int $timeout = -1): bool
              return false;
         }
 
-        $this->cache->save($this->lockSign, $this->getIdentifier($name), [], $timeout * 100);
+        $timeout = $timeout <= 0 ? null : $timeout;
+        $this->cache->save($this->lockSign, $this->getIdentifier($name), [], $timeout);
 
         $data = $this->cache->load($this->getIdentifier($name));
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ public function lock(string $name, int $timeout = -1): bool`
`55`	`55`	`return false;`
`56`	`56`	`}`
`57`	`57`
`58`		`- $this->cache->save($this->lockSign, $this->getIdentifier($name), [], $timeout * 100);`
	`58`	`+ $timeout = $timeout <= 0 ? null : $timeout;`
	`59`	`+ $this->cache->save($this->lockSign, $this->getIdentifier($name), [], $timeout);`
`59`	`60`
`60`	`61`	`$data = $this->cache->load($this->getIdentifier($name));`
`61`	`62`