summaryrefslogtreecommitdiff
path: root/java/common
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-08-30 17:47:48 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-08-30 17:47:48 +0000
commit9c233eedc9da99c80b240170dd328a1b3d16ed7b (patch)
tree8264c35d04a59c1bf02a50e8f267bae9dbdf764d /java/common
parent8cdb9b318beefaa06b65da8c394660b6536eb8a1 (diff)
downloadqpid-python-9c233eedc9da99c80b240170dd328a1b3d16ed7b.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/qpid@1621498 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/common')
-rw-r--r--java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java2
-rw-r--r--java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java b/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
index ebecb7b483..53e8c998c9 100644
--- a/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
+++ b/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/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java b/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
index d00ddf4074..291b7e8d29 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
+++ b/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;
}