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

Revert changes of pull request #45

Browse Source
This commit is contained in:
norman 2011-11-11 08:51:00 +01:00
parent d760b4cffe
commit 1a6f8369ea
1 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/org/jboss/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java
View File

@ -195,7 +195,6 @@ public class LengthFieldBasedFrameDecoder extends FrameDecoder {
private final int lengthFieldEndOffset; private final int lengthFieldEndOffset;
private final int lengthAdjustment; private final int lengthAdjustment;
private final int initialBytesToStrip; private final int initialBytesToStrip;
private final boolean lengthFieldIncludedInFrameLength;
private boolean discardingTooLongFrame; private boolean discardingTooLongFrame;
private long tooLongFrameLength; private long tooLongFrameLength;
private long bytesToDiscard; private long bytesToDiscard;
@ -217,9 +216,10 @@ public class LengthFieldBasedFrameDecoder extends FrameDecoder {
public LengthFieldBasedFrameDecoder( public LengthFieldBasedFrameDecoder(
int maxFrameLength, int maxFrameLength,
int lengthFieldOffset, int lengthFieldLength) { int lengthFieldOffset, int lengthFieldLength) {
this(maxFrameLength, lengthFieldOffset, lengthFieldLength, 0, 0, false); this(maxFrameLength, lengthFieldOffset, lengthFieldLength, 0, 0);
} }
/** /**
* Creates a new instance. * Creates a new instance.
* *
@ -240,32 +240,6 @@ public class LengthFieldBasedFrameDecoder extends FrameDecoder {
int maxFrameLength, int maxFrameLength,
int lengthFieldOffset, int lengthFieldLength, int lengthFieldOffset, int lengthFieldLength,
int lengthAdjustment, int initialBytesToStrip) { int lengthAdjustment, int initialBytesToStrip) {
this(maxFrameLength, lengthFieldOffset, lengthFieldLength, lengthAdjustment,
initialBytesToStrip, false);
}
/**
* Creates a new instance.
*
* @param maxFrameLength
* the maximum length of the frame. If the length of the frame is
* greater than this value, {@link TooLongFrameException} will be
* thrown.
* @param lengthFieldOffset
* the offset of the length field
* @param lengthFieldLength
* the length of the length field
* @param lengthAdjustment
* the compensation value to add to the value of the length field
* @param initialBytesToStrip
* the number of first bytes to strip out from the decoded frame
* @param lengthFieldIncludedInFrameLength
* whether to count length field into frame length
*/
public LengthFieldBasedFrameDecoder(
int maxFrameLength,
int lengthFieldOffset, int lengthFieldLength,
int lengthAdjustment, int initialBytesToStrip, boolean lengthFieldIncludedInFrameLength) {
if (maxFrameLength <= 0) { if (maxFrameLength <= 0) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"maxFrameLength must be a positive integer: " + "maxFrameLength must be a positive integer: " +
@ -306,7 +280,6 @@ public class LengthFieldBasedFrameDecoder extends FrameDecoder {
this.lengthAdjustment = lengthAdjustment; this.lengthAdjustment = lengthAdjustment;
lengthFieldEndOffset = lengthFieldOffset + lengthFieldLength; lengthFieldEndOffset = lengthFieldOffset + lengthFieldLength;
this.initialBytesToStrip = initialBytesToStrip; this.initialBytesToStrip = initialBytesToStrip;
this.lengthFieldIncludedInFrameLength = lengthFieldIncludedInFrameLength;
} }
@Override @Override
@ -355,9 +328,8 @@ public class LengthFieldBasedFrameDecoder extends FrameDecoder {
"negative pre-adjustment length field: " + frameLength); "negative pre-adjustment length field: " + frameLength);
} }
if (!lengthFieldIncludedInFrameLength) {
frameLength += lengthAdjustment + lengthFieldEndOffset; frameLength += lengthAdjustment + lengthFieldEndOffset;
}
if (frameLength < lengthFieldEndOffset) { if (frameLength < lengthFieldEndOffset) {
buffer.skipBytes(lengthFieldEndOffset); buffer.skipBytes(lengthFieldEndOffset);
throw new CorruptedFrameException( throw new CorruptedFrameException(