From facd35a7e75982ce1c3e9f285ebac45db2e9fec7 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 9 May 2018 09:17:32 +0200
Subject: [PATCH] OO-3463: better check exists of the physical file of a wiki
page
---
src/main/java/org/olat/modules/wiki/Wiki.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/modules/wiki/Wiki.java b/src/main/java/org/olat/modules/wiki/Wiki.java
index ed4d92c1c1f..399b4d44432 100644
--- a/src/main/java/org/olat/modules/wiki/Wiki.java
+++ b/src/main/java/org/olat/modules/wiki/Wiki.java
@@ -152,8 +152,14 @@ public class Wiki implements WikiContainer, Serializable {
return page;
}
if (loadContent) {
- VFSLeaf leaf = (VFSLeaf) pageContainer.resolve(page.getPageId() + "." + WikiManager.WIKI_FILE_SUFFIX);
- page.setContent(FileUtils.load(leaf.getInputStream(), "utf-8"));
+ VFSItem item = pageContainer.resolve(page.getPageId() + "." + WikiManager.WIKI_FILE_SUFFIX);
+ if(item instanceof VFSLeaf) {
+ try(InputStream in = ((VFSLeaf)item).getInputStream()) {
+ page.setContent(FileUtils.load(in, "utf-8"));
+ } catch(Exception e) {
+ log.error("Cannot load wiki page: " + item, e);
+ }
+ }
}
return page;
}
--
GitLab