Cache: fixed deadlock when exception is thrown in fallback [Closes #36]

Author: dg

composer.json

@@ -19,7 +19,7 @@
 		"nette/utils": "~2.2"
 	},
 	"require-dev": {
-		"nette/tester": "~1.4",
+		"nette/tester": "~1.6",
 		"nette/di": "~2.3",
 		"latte/latte": "~2.3.0"
 	},

src/Caching/Cache.php

@@ -125,7 +125,12 @@ public function save($key, $data, array $dependencies = NULL)
 
 		if ($data instanceof Nette\Callback || $data instanceof \Closure) {
 			$this->storage->lock($key);
-			$data = call_user_func_array($data, [& $dependencies]);
+			try {
+				$data = call_user_func_array($data, [& $dependencies]);
+			} catch (\Exception $e) {
+				$this->storage->remove($key);
+				throw $e;
+			}
 		}
 
 		if ($data === NULL) {

tests/Storages/FileStorage.deadlock.phpt

@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Test: Nette\Caching\Cache dead lock & exception test.
+ */
+
+use Nette\Caching\Cache;
+use Nette\Caching\Storages\FileStorage;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$storage = new FileStorage(TEMP_DIR);
+$cache = new Cache($storage);
+
+try {
+	$cache->load('key', function () {
+		throw new Exception;
+	});
+} catch (Exception $e) {
+}
+
+Assert::noError(function () use ($cache) {
+	$cache->load('key', function () {});
+});

tests/Storages/IJournalTestCase.inc

@@ -4,7 +4,7 @@
  * Test: Common tests for all IJournal implementations.
  */
 
-use	Nette\Caching\Cache;
+use Nette\Caching\Cache;
 use Nette\Caching\Storages\IJournal;
 use Tester\Assert;