summaryrefslogtreecommitdiff
path: root/qpid/java/client
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
commit2b40fe611fbfd2232b2b03feab7dcefb4a70975a (patch)
tree2aad9953f32f003f715d4e8668fe2f1af40688f4 /qpid/java/client
parent3eef81f1fd50e950c2230b05d973ae7a7e2091e8 (diff)
downloadqpid-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/client')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
index 48bfe74cfc..5c9d8f9b91 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
@@ -946,6 +946,6 @@ public class AMQProtocolHandler implements ProtocolEngine
public void setMaxFrameSize(final long frameMax)
{
- _decoder.setMaxFrameSize(frameMax == 0l ? 0xffffffffl : frameMax);
+ _decoder.setMaxFrameSize(frameMax == 0l || frameMax > (long) Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) frameMax);
}
}