From 9cce808d08fe9b5ed45bb3efb5fddb656b5e7f1a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 28 Jun 2013 08:18:03 -0400
Subject: [PATCH] Updated to JGit 3.0.0.201306101825-r
---
src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java
index 4bce77f..7d4d68c 100644
--- a/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java
@@ -26,8 +26,6 @@
import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.resource.ContextRelativeResource;
-import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.eclipse.jgit.lib.Constants;
import com.gitblit.GitBlit;
@@ -160,14 +158,14 @@
String message;
InputStreamReader reader = null;
try {
- ContextRelativeResource res = WicketUtils.getResource(name);
- InputStream is = res.getResourceStream().getInputStream();
+ InputStream is = getClass().getResourceAsStream("/" + name);
+ if (is == null) {
+ continue;
+ }
reader = new InputStreamReader(is, Constants.CHARACTER_ENCODING);
message = MarkdownUtils.transformMarkdown(reader);
reader.close();
return message;
- } catch (ResourceStreamNotFoundException t) {
- continue;
} catch (Throwable t) {
message = MessageFormat.format(getString("gb.failedToReadMessage"), file);
error(message, t, false);
--
Gitblit v1.9.1