Skip to content

Commit 2b0deae

Browse files
Merge branch '4.1'
* 4.1: [TwigBridge] fix lowest version of symfony/form Think positive KernelInterface can return null container [DI] Detect circular references with ChildDefinition parent [VarDumper] Fix global dump function return value for PHP7 [Ldap] Use shut up operator on connection errors at ldap_start_tls Implement startTest rather than startTestSuite [OptionsResolver] remove dead code and useless else [HttpFoundation] don't override StreamedResponse::setNotModified() Added relevent links for parsing to the phpdoc Add stricter checking for valid date time string Fix symfony/console (optional) dependency for MonologBridge fix not displaying labels when value is false [Form] Fix DateTimeType html5 input format
2 parents 503ce0c + e6b59d9 commit 2b0deae

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Lock.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ public function __destruct()
6969
public function acquire($blocking = false)
7070
{
7171
try {
72-
if (!$blocking) {
73-
$this->store->save($this->key);
74-
} else {
72+
if ($blocking) {
7573
$this->store->waitAndSave($this->key);
74+
} else {
75+
$this->store->save($this->key);
7676
}
7777

7878
$this->dirty = true;

0 commit comments

Comments
 (0)