From 7963125c41b00b7e454c0fcb1406df0cabb42de0 Mon Sep 17 00:00:00 2001
From: Bernhard Reiter <ockham@raz.or.at>
Date: Sat, 4 Oct 2014 14:08:20 +0200
Subject: [PATCH] Remove two obsolete try...catch blocks.

---
 lib/private/tags.php | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/lib/private/tags.php b/lib/private/tags.php
index 5a962c4891..aceb88355c 100644
--- a/lib/private/tags.php
+++ b/lib/private/tags.php
@@ -99,12 +99,7 @@ class Tags implements \OCP\ITags {
 	*
 	*/
 	protected function loadTags($defaultTags=array()) {
-		try {
-			$this->tags = $this->mapper->loadTags(array($this->user), $this->type);
-		} catch(\Exception $e) {
-			\OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
-				\OCP\Util::ERROR);
-		}
+		$this->tags = $this->mapper->loadTags(array($this->user), $this->type);
 
 		if(count($defaultTags) > 0 && count($this->tags) === 0) {
 			$this->addMultiple($defaultTags, true);
@@ -580,13 +575,10 @@ class Tags implements \OCP\ITags {
 				$tag = $this->tags[$key];
 				$id = $tag->getId();
 				unset($this->tags[$key]);
-				try {
-					$this->mapper->delete($tag);
-				} catch(\Exception $e) {
-					\OCP\Util::writeLog('core', __METHOD__ . ', exception: '
-						. $e->getMessage(), \OCP\Util::ERROR);
-					return false;
-				}
+				$this->mapper->delete($tag);
+			} else {
+				\OCP\Util::writeLog('core', __METHOD__ . 'Cannot delete tag ' . $name
+					. ': not found.', \OCP\Util::ERROR);
 			}
 			if(!is_null($id) && $id !== false) {
 				try {