diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-08-30 17:47:48 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-08-30 17:47:48 +0000 |
| commit | 2b40fe611fbfd2232b2b03feab7dcefb4a70975a (patch) | |
| tree | 2aad9953f32f003f715d4e8668fe2f1af40688f4 /qpid/java/common/src/main | |
| parent | 3eef81f1fd50e950c2230b05d973ae7a7e2091e8 (diff) | |
| download | qpid-python-2b40fe611fbfd2232b2b03feab7dcefb4a70975a.tar.gz | |
QPID-6055 : [Java Broker] Ensure max frame size is always less than Integer.MAX_VALUE
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1621498 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common/src/main')
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java | 2 | ||||
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java b/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java index ebecb7b483..53e8c998c9 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java @@ -96,7 +96,7 @@ public class AMQDecoder _expectProtocolInitiation = expectProtocolInitiation; } - public void setMaxFrameSize(final long frameMax) + public void setMaxFrameSize(final int frameMax) { _dataBlockDecoder.setMaxFrameSize(frameMax); } diff --git a/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java index d00ddf4074..291b7e8d29 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java @@ -41,7 +41,7 @@ public class AMQDataBlockDecoder } private Logger _logger = LoggerFactory.getLogger(AMQDataBlockDecoder.class); - private long _maxFrameSize = AMQConstant.FRAME_MIN_SIZE.getCode(); + private int _maxFrameSize = AMQConstant.FRAME_MIN_SIZE.getCode(); public AMQDataBlockDecoder() { } @@ -113,7 +113,7 @@ public class AMQDataBlockDecoder return frame; } - public void setMaxFrameSize(final long maxFrameSize) + public void setMaxFrameSize(final int maxFrameSize) { _maxFrameSize = maxFrameSize; } |