From 2b40fe611fbfd2232b2b03feab7dcefb4a70975a Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Sat, 30 Aug 2014 17:47:48 +0000 Subject: 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 --- qpid/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java | 2 +- .../src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'qpid/java/common/src') 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; } -- cgit v1.2.1