Merged #137 "NPE in RawServlet#L265"

James Moger

2014-07-05 aa4f732bc3e285dc1433af358c89ab54c90f0d50

Merged #137 "NPE in RawServlet#L265"

 src/main/java/com/gitblit/servlet/RawServlet.java

@@ -257,6 +257,15 @@
                        // 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);