Browse Source

Fix possible NPE in RawServlet

tags/v1.6.1
James Moger 10 years ago
parent
commit
498cdca0cc
1 changed files with 9 additions and 0 deletions
  1. 9
    0
      src/main/java/com/gitblit/servlet/RawServlet.java

+ 9
- 0
src/main/java/com/gitblit/servlet/RawServlet.java View File

@@ -254,6 +254,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);

Loading…
Cancel
Save