summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2014-01-09 14:36:35 +0000
committerGordon Sim <gsim@apache.org>2014-01-09 14:36:35 +0000
commitc2d08814e1aba13402f32debb68a3b851e5ce339 (patch)
tree98f0f72ee5de9ead7903d1f068b785d549c1ba07
parenta95a9818e8157edd23bb43a0fe36366869859a69 (diff)
downloadqpid-python-c2d08814e1aba13402f32debb68a3b851e5ce339.tar.gz
QPID-5456: Use the local max-frame-size when enforcing limit on what is received, not that of the peer (merged from r1556603)
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.26@1556819 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java
index 83cb36246a..bc16ba14e0 100644
--- a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java
@@ -127,9 +127,9 @@ public class FrameHandler implements ProtocolHandler
break;
}
- else if(size > _connection.getMaxFrameSize())
+ else if(size > _connection.getDesiredMaxFrameSize().intValue())
{
- frameParsingError = createFramingError("specified frame size %d larger than maximum frame header size %d", size, _connection.getMaxFrameSize());
+ frameParsingError = createFramingError("specified frame size %d larger than maximum frame header size %d", size, _connection.getDesiredMaxFrameSize().intValue());
state = State.ERROR;
break;
}