fixed possible race condition when creating a directory

fabpot · fabpot · commit b3c1ce5a18b1 · 2015-02-10T16:07:19.000+01:00
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -666,7 +666,7 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
 
         if ('file' === $config['cache']) {
             $cacheDir = $container->getParameterBag()->resolveValue($config['file_cache_dir']);
-            if (!is_dir($cacheDir) && false === @mkdir($cacheDir, 0777, true)) {
+            if (!is_dir($cacheDir) && false === @mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {
                 throw new \RuntimeException(sprintf('Could not create cache directory "%s".', $cacheDir));
             }
 

Original file line number	Diff line number	Diff line change
`@@ -666,7 +666,7 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde`
`666`	`666`
`667`	`667`	`if ('file' === $config['cache']) {`
`668`	`668`	`$cacheDir = $container->getParameterBag()->resolveValue($config['file_cache_dir']);`
`669`		`- if (!is_dir($cacheDir) && false === @mkdir($cacheDir, 0777, true)) {`
	`669`	`+ if (!is_dir($cacheDir) && false === @mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {`
`670`	`670`	`throw new \RuntimeException(sprintf('Could not create cache directory "%s".', $cacheDir));`
`671`	`671`	`}`
`672`	`672`