summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@owncloud.com>2016-02-06 13:31:31 +0100
committerRoeland Jago Douma <rullzer@owncloud.com>2016-02-06 13:31:54 +0100
commit46faf6d3ca437c8795af79f1851b4bd6b4a92280 (patch)
tree3281c3aa86454dde8bba971e08b0d66fd9b090ad
parent8486d617645a5ef75da34df10ed663ef77bed257 (diff)
downloadnextcloud-server-46faf6d3ca437c8795af79f1851b4bd6b4a92280.tar.gz
nextcloud-server-46faf6d3ca437c8795af79f1851b4bd6b4a92280.zip
Fix exception on delete
-rw-r--r--lib/private/share20/manager.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/private/share20/manager.php b/lib/private/share20/manager.php
index 7d0017bf6f7..33085410e1d 100644
--- a/lib/private/share20/manager.php
+++ b/lib/private/share20/manager.php
@@ -22,6 +22,7 @@
namespace OC\Share20;
use OCP\Files\IRootFolder;
+use OCP\Files\NotFoundException;
use OCP\IUserManager;
use OCP\Share\IManager;
use OCP\Share\IProviderFactory;
@@ -795,7 +796,11 @@ class Manager implements IManager {
if ($share->getExpirationDate() !== null &&
$share->getExpirationDate() <= $today
) {
- $this->deleteShare($share);
+ try {
+ $this->deleteShare($share);
+ } catch (NotFoundException $e) {
+ //Ignore since this basically means the share is deleted
+ }
continue;
}
$added++;