andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made HttpTunnelingServlet conform to the good Servlet guide line :)

Browse Source
This commit is contained in:
Trustin Lee 2009-04-23 06:33:19 +00:00
parent 3d568d449b
commit 563fd2c286
1 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingServlet.java
View File

@ -36,8 +36,6 @@ import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.logging.InternalLogger;
import org.jboss.netty.logging.InternalLoggerFactory;
/**
* A Servlet that acts as a proxy for a netty channel
@ -50,39 +48,21 @@ public class HttpTunnelingServlet extends HttpServlet {
private static final long serialVersionUID = -872309493835745385L;
private static final InternalLogger logger =
InternalLoggerFactory.getInstance(HttpTunnelingServlet.class);
final static String CHANNEL_PROP = "channel";
final static String HANDLER_PROP = "handler";
protected void doRequest(
HttpServletRequest request,
HttpServletResponse response) {
HttpServletResponse response) throws IOException {
HttpSession session = request.getSession();
Channel channel = (Channel) session.getAttribute(CHANNEL_PROP);
HttpTunnelingChannelHandler handler =
(HttpTunnelingChannelHandler) session.getAttribute(HANDLER_PROP);
try {
if (handler.isStreaming()) {
streamResponse(request, response, session, handler, channel);
} else {
pollResponse(channel, request, response, session, handler);
}
} catch (Throwable t) {
logger.warn("Unexpected exception", t);
} finally {
try {
request.getInputStream().close();
} catch (IOException e) {
// Ignore.
}
try {
response.getOutputStream().close();
} catch (IOException e) {
// Ignore.
}
}
}
private void streamResponse(
@ -93,8 +73,9 @@ public class HttpTunnelingServlet extends HttpServlet {
try {
response.setHeader("JSESSIONID", session.getId());
response.setHeader("Content-Type", "application/octet-stream");
response.setContentLength(-1);
response.setStatus(HttpServletResponse.SC_OK);
// Initiate chunked encoding by flushing the headers.
response.getOutputStream().flush();
handler.setOutputStream(response.getOutputStream());