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

[#1211] Fail ChannelPromise on SpdyProtocolException like it was before in 3.x

Browse Source
This commit is contained in:
Norman Maurer 2013-03-28 07:20:34 +01:00
parent a97cca50df
commit 14a47075be
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySessionHandler.java
View File

@ -459,7 +459,16 @@ public class SpdySessionHandler
msg instanceof SpdyGoAwayFrame || msg instanceof SpdyGoAwayFrame ||
msg instanceof SpdyHeadersFrame || msg instanceof SpdyHeadersFrame ||
msg instanceof SpdyWindowUpdateFrame) { msg instanceof SpdyWindowUpdateFrame) {
handleOutboundMessage(ctx, msg); try {
handleOutboundMessage(ctx, msg, promise);
} catch (SpdyProtocolException e) {
if (e == PROTOCOL_EXCEPTION) {
// on the case of PROTOCOL_EXCEPTION faile the promise directly
// See #1211
promise.setFailure(PROTOCOL_EXCEPTION);
return;
}
}
} else { } else {
ctx.nextOutboundMessageBuffer().add(msg); ctx.nextOutboundMessageBuffer().add(msg);
} }
@ -467,7 +476,7 @@ public class SpdySessionHandler
ctx.flush(promise); ctx.flush(promise);
} }
private void handleOutboundMessage(ChannelHandlerContext ctx, Object msg) private void handleOutboundMessage(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
throws Exception { throws Exception {
if (msg instanceof SpdyDataFrame) { if (msg instanceof SpdyDataFrame) {
@ -477,8 +486,7 @@ public class SpdySessionHandler
// Frames must not be sent on half-closed streams // Frames must not be sent on half-closed streams
if (spdySession.isLocalSideClosed(streamID)) { if (spdySession.isLocalSideClosed(streamID)) {
ctx.fireExceptionCaught(PROTOCOL_EXCEPTION); throw PROTOCOL_EXCEPTION;
return;
} }
/* /*
@ -568,16 +576,14 @@ public class SpdySessionHandler
int streamID = spdySynStreamFrame.getStreamId(); int streamID = spdySynStreamFrame.getStreamId();
if (isRemoteInitiatedID(streamID)) { if (isRemoteInitiatedID(streamID)) {
ctx.fireExceptionCaught(PROTOCOL_EXCEPTION); throw PROTOCOL_EXCEPTION;
return;
} }
byte priority = spdySynStreamFrame.getPriority(); byte priority = spdySynStreamFrame.getPriority();
boolean remoteSideClosed = spdySynStreamFrame.isUnidirectional(); boolean remoteSideClosed = spdySynStreamFrame.isUnidirectional();
boolean localSideClosed = spdySynStreamFrame.isLast(); boolean localSideClosed = spdySynStreamFrame.isLast();
if (!acceptStream(streamID, priority, remoteSideClosed, localSideClosed)) { if (!acceptStream(streamID, priority, remoteSideClosed, localSideClosed)) {
ctx.fireExceptionCaught(PROTOCOL_EXCEPTION); throw PROTOCOL_EXCEPTION;
return;
} }
} else if (msg instanceof SpdySynReplyFrame) { } else if (msg instanceof SpdySynReplyFrame) {
@ -587,8 +593,7 @@ public class SpdySessionHandler
// Frames must not be sent on half-closed streams // Frames must not be sent on half-closed streams
if (!isRemoteInitiatedID(streamID) || spdySession.isLocalSideClosed(streamID)) { if (!isRemoteInitiatedID(streamID) || spdySession.isLocalSideClosed(streamID)) {
ctx.fireExceptionCaught(PROTOCOL_EXCEPTION); throw PROTOCOL_EXCEPTION;
return;
} }
// Close the local side of the stream if this is the last frame // Close the local side of the stream if this is the last frame
@ -641,8 +646,7 @@ public class SpdySessionHandler
// Why is this being sent? Intercept it and fail the write. // Why is this being sent? Intercept it and fail the write.
// Should have sent a CLOSE ChannelStateEvent // Should have sent a CLOSE ChannelStateEvent
ctx.fireExceptionCaught(PROTOCOL_EXCEPTION); throw PROTOCOL_EXCEPTION;
return;
} else if (msg instanceof SpdyHeadersFrame) { } else if (msg instanceof SpdyHeadersFrame) {
@ -651,8 +655,7 @@ public class SpdySessionHandler
// Frames must not be sent on half-closed streams // Frames must not be sent on half-closed streams
if (spdySession.isLocalSideClosed(streamID)) { if (spdySession.isLocalSideClosed(streamID)) {
ctx.fireExceptionCaught(PROTOCOL_EXCEPTION); throw PROTOCOL_EXCEPTION;
return;
} }
// Close the local side of the stream if this is the last frame // Close the local side of the stream if this is the last frame
@ -663,7 +666,7 @@ public class SpdySessionHandler
} else if (msg instanceof SpdyWindowUpdateFrame) { } else if (msg instanceof SpdyWindowUpdateFrame) {
// Why is this being sent? Intercept it and fail the write. // Why is this being sent? Intercept it and fail the write.
ctx.fireExceptionCaught(PROTOCOL_EXCEPTION); throw PROTOCOL_EXCEPTION;
} }
ctx.nextOutboundMessageBuffer().add(msg); ctx.nextOutboundMessageBuffer().add(msg);