From def8e0c12a263e16ec7245c5be47b6aed10f7a78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 2 Oct 2015 17:40:45 +0200
Subject: [PATCH] log the exception during zip creation

---
 lib/private/files.php | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/lib/private/files.php b/lib/private/files.php
index 5befda3bad..4783a61706 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -173,24 +173,14 @@ class OC_Files {
 			} else {
 				\OC\Files\Filesystem::readfile($filename);
 			}
-			if ($getType === self::FILE) {
-				$view->unlockFile($filename, ILockingProvider::LOCK_SHARED);
-			}
-			if ($getType === self::ZIP_FILES) {
-				foreach ($files as $file) {
-					$file = $dir . '/' . $file;
-					$view->unlockFile($file, ILockingProvider::LOCK_SHARED);
-				}
-			}
-			if ($getType === self::ZIP_DIR) {
-				$file = $dir . '/' . $files;
-				$view->unlockFile($file, ILockingProvider::LOCK_SHARED);
-			}
+			self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
 		} catch (\OCP\Lock\LockedException $ex) {
+			OC::$server->getLogger()->logException($ex);
 			$l = \OC::$server->getL10N('core');
 			$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
 			\OC_Template::printErrorPage($l->t('File is currently busy, please try again later'), $hint);
 		} catch (\Exception $ex) {
+			OC::$server->getLogger()->logException($ex);
 			$l = \OC::$server->getL10N('core');
 			$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
 			\OC_Template::printErrorPage($l->t('Can\'t read file'), $hint);
@@ -278,4 +268,27 @@ class OC_Files {
 		}
 		return false;
 	}
+
+	/**
+	 * @param $dir
+	 * @param $files
+	 * @param $getType
+	 * @param $view
+	 * @param $filename
+	 */
+	private static function unlockAllTheFiles($dir, $files, $getType, $view, $filename) {
+		if ($getType === self::FILE) {
+			$view->unlockFile($filename, ILockingProvider::LOCK_SHARED);
+		}
+		if ($getType === self::ZIP_FILES) {
+			foreach ($files as $file) {
+				$file = $dir . '/' . $file;
+				$view->unlockFile($file, ILockingProvider::LOCK_SHARED);
+			}
+		}
+		if ($getType === self::ZIP_DIR) {
+			$file = $dir . '/' . $files;
+			$view->unlockFile($file, ILockingProvider::LOCK_SHARED);
+		}
+	}
 }