diff options
Diffstat (limited to 'src/main/java/com/gitblit/servlet/RawServlet.java')
| -rw-r--r-- | src/main/java/com/gitblit/servlet/RawServlet.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/main/java/com/gitblit/servlet/RawServlet.java b/src/main/java/com/gitblit/servlet/RawServlet.java index ff3f7359..a9e58202 100644 --- a/src/main/java/com/gitblit/servlet/RawServlet.java +++ b/src/main/java/com/gitblit/servlet/RawServlet.java @@ -173,6 +173,9 @@ public class RawServlet extends DaggerServlet { repository = path.substring(0, slash); } offset += slash; + if (offset == 0) { + offset++; + } r = repositoryManager.getRepository(repository, false); if (repository.equals(path)) { // either only repository in url or no repository found @@ -252,6 +255,15 @@ public class RawServlet extends DaggerServlet { // load, interpret, and serve text content as UTF-8 String [] encodings = runtimeManager.getSettings().getStrings(Keys.web.blobEncodings).toArray(new String[0]); String content = JGitUtils.getStringContent(r, commit.getTree(), requestedPath, encodings); + if (content == null) { + logger.error("RawServlet Failed to load {} {} {}", repository, commit.getName(), path); + String str = MessageFormat.format( + "# Error\nSorry, the requested resource **{0}** was not found.", + requestedPath); + response.setStatus(HttpServletResponse.SC_NOT_FOUND); + error(response, str); + return; + } byte [] bytes = content.getBytes(Constants.ENCODING); response.setContentLength(bytes.length); |