]> source.dussan.org Git - nextcloud-server.git/commitdiff
[Fixing unit tests in Windows]
authorThomas Mueller <thomas.mueller@tmit.eu>
Mon, 10 Jun 2013 17:28:55 +0000 (19:28 +0200)
committerThomas Mueller <thomas.mueller@tmit.eu>
Mon, 10 Jun 2013 17:28:55 +0000 (19:28 +0200)
on windows open resources will be locked while the stream is open.
closing the resource allows deletion below

lib/files/view.php

index e2fc8d965b892dfdc405f47e227757b8feaea00a..25071709fbe243869e68ccbdf7a6d5cabc835de5 100644 (file)
@@ -386,6 +386,12 @@ class View {
                                                $source = $this->fopen($path1 . $postFix1, 'r');
                                                $target = $this->fopen($path2 . $postFix2, 'w');
                                                list($count, $result) = \OC_Helper::streamCopy($source, $target);
+
+                                               // close open handle - especially $source is necessary because unlink below will
+                                               // throw an exception on windows because the file is locked
+                                               fclose($source);
+                                               fclose($target);
+
                                                if ($result !== false) {
                                                        list($storage1, $internalPath1) = Filesystem::resolvePath($absolutePath1 . $postFix1);
                                                        $storage1->unlink($internalPath1);