summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-11-10 12:46:53 +0100
committerVincent Petry <pvince81@owncloud.com>2014-11-10 12:46:53 +0100
commit676b911b22c97eacddc53a2ff5a8333846c981e2 (patch)
tree397a6fa5032f25e7169fd6d4e579dd0d89f2fd01 /lib
parent0d00e247c374318d502cb0501fce3093320fa5a3 (diff)
parenta10ae2816eac4ab9b891972567d20e15dd2cb202 (diff)
downloadnextcloud-server-676b911b22c97eacddc53a2ff5a8333846c981e2.tar.gz
nextcloud-server-676b911b22c97eacddc53a2ff5a8333846c981e2.zip
Merge pull request #12027 from owncloud/cleanup_exceptions
[encryption] clean up encryption exceptions
Diffstat (limited to 'lib')
-rw-r--r--lib/private/connector/sabre/file.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index dc036c1adca..db8ce14212c 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -100,7 +100,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
} catch (\OCP\Files\LockNotAcquiredException $e) {
// the file is currently being written to by another process
throw new OC_Connector_Sabre_Exception_FileLocked($e->getMessage(), $e->getCode(), $e);
- } catch (\OCA\Encryption\Exceptions\EncryptionException $e) {
+ } catch (\OCA\Encryption\Exception\EncryptionException $e) {
throw new \Sabre\DAV\Exception\Forbidden($e->getMessage());
}
@@ -156,7 +156,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
} else {
try {
return $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
- } catch (\OCA\Encryption\Exceptions\EncryptionException $e) {
+ } catch (\OCA\Encryption\Exception\EncryptionException $e) {
throw new \Sabre\DAV\Exception\Forbidden($e->getMessage());
}
}