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

[#706] Fix SpdyHttpResponseStreamIdHandler which was ported incorrectly

Browse Source
This commit is contained in:
Norman Maurer 2012-11-02 19:50:41 +01:00
parent 87ba8cb4b0
commit 0526e1cb06
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpResponseStreamIdHandler.java
View File

@ -30,16 +30,25 @@ import io.netty.handler.codec.http.HttpResponse;
* for HTTP. * for HTTP.
*/ */
public class SpdyHttpResponseStreamIdHandler extends public class SpdyHttpResponseStreamIdHandler extends
MessageToMessageCodec<HttpRequest, HttpRequest, Object, Object> { MessageToMessageCodec<Object, Object, HttpMessage, HttpMessage> {
private static final Integer NO_ID = -1; private static final Integer NO_ID = -1;
private final Queue<Integer> ids = new LinkedList<Integer>(); private final Queue<Integer> ids = new LinkedList<Integer>();
public SpdyHttpResponseStreamIdHandler() { public SpdyHttpResponseStreamIdHandler() {
super(new Class<?>[] { HttpRequest.class, SpdyRstStreamFrame.class }, new Class<?>[] { HttpResponse.class }); super(new Class<?>[] { HttpMessage.class, SpdyRstStreamFrame.class }, new Class<?>[] { HttpMessage.class });
} }
@Override @Override
public Object encode(ChannelHandlerContext ctx, Object msg) throws Exception { public HttpMessage encode(ChannelHandlerContext ctx, HttpMessage msg) throws Exception {
Integer id = ids.poll();
if (id != null && id != NO_ID && !msg.containsHeader(SpdyHttpHeaders.Names.STREAM_ID)) {
SpdyHttpHeaders.setStreamId(msg, id);
}
return msg;
}
@Override
public Object decode(ChannelHandlerContext ctx, Object msg) throws Exception {
if (msg instanceof HttpMessage) { if (msg instanceof HttpMessage) {
boolean contains = ((HttpMessage) msg).containsHeader(SpdyHttpHeaders.Names.STREAM_ID); boolean contains = ((HttpMessage) msg).containsHeader(SpdyHttpHeaders.Names.STREAM_ID);
if (!contains) { if (!contains) {
@ -54,13 +63,4 @@ public class SpdyHttpResponseStreamIdHandler extends
return msg; return msg;
} }
@Override
public HttpRequest decode(ChannelHandlerContext ctx, HttpRequest msg) throws Exception {
Integer id = ids.poll();
if (id != null && id != NO_ID && !msg.containsHeader(SpdyHttpHeaders.Names.STREAM_ID)) {
SpdyHttpHeaders.setStreamId(msg, id);
}
return msg;
}
} }