antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

* Make sure resource paths passed to res.forward() start with a slash,

Browse source 
as Jetty 5.1 wants it that way.
* Add curly braces to statements.
This commit is contained in:
hns 2007-12-12 12:44:21 +00:00
parent cdb9a335e4
commit 077e7b540b
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/helma/servlet/AbstractServletClient.java
View file

@ -439,10 +439,15 @@ public abstract class AbstractServletClient extends HttpServlet {
void sendForward(HttpServletResponse res, HttpServletRequest req, void sendForward(HttpServletResponse res, HttpServletRequest req,
ResponseTrans hopres) throws IOException { ResponseTrans hopres) throws IOException {
String forward = hopres.getForward(); String forward = hopres.getForward();
// Jetty 5.1 bails at forward paths without leading slash, so fix it
if (!forward.startsWith("/")) {
forward = "/" + forward;
}
ServletContext cx = getServletConfig().getServletContext(); ServletContext cx = getServletConfig().getServletContext();
String path = cx.getRealPath(forward); String path = cx.getRealPath(forward);
if (path == null) if (path == null) {
throw new IOException("Resource " + forward + " not found"); throw new IOException("Resource " + forward + " not found");
}
File file = new File(path); File file = new File(path);
// check if the client has an up-to-date copy so we can // check if the client has an up-to-date copy so we can
@ -456,8 +461,9 @@ public abstract class AbstractServletClient extends HttpServlet {
res.setContentType(hopres.getContentType()); res.setContentType(hopres.getContentType());
InputStream in = cx.getResourceAsStream(forward); InputStream in = cx.getResourceAsStream(forward);
if (in == null) if (in == null) {
throw new IOException("Can't read " + path); throw new IOException("Can't read " + path);
}
try { try {
OutputStream out = res.getOutputStream(); OutputStream out = res.getOutputStream();
@ -466,13 +472,14 @@ public abstract class AbstractServletClient extends HttpServlet {
int l; int l;
while (length > 0) { while (length > 0) {
if (length < bufferSize) if (length < bufferSize) {
l = in.read(buffer, 0, length); l = in.read(buffer, 0, length);
else } else {
l = in.read(buffer, 0, bufferSize); l = in.read(buffer, 0, bufferSize);
}
if (l == -1) if (l == -1) {
break; break;
}
length -= l; length -= l;
out.write(buffer, 0, l); out.write(buffer, 0, l);