You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2014/01/09 15:36:36 UTC
svn commit: r1556819 - in /qpid/branches/0.26/qpid/java: ./ amqp-1-0-common/
amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java
Author: gsim
Date: Thu Jan 9 14:36:35 2014
New Revision: 1556819
URL: http://svn.apache.org/r1556819
Log:
QPID-5456: Use the local max-frame-size when enforcing limit on what is received, not that of the peer (merged from r1556603)
Modified:
qpid/branches/0.26/qpid/java/ (props changed)
qpid/branches/0.26/qpid/java/amqp-1-0-common/ (props changed)
qpid/branches/0.26/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java
Propchange: qpid/branches/0.26/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1556603
Propchange: qpid/branches/0.26/qpid/java/amqp-1-0-common/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-common:r1556603
Modified: qpid/branches/0.26/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java?rev=1556819&r1=1556818&r2=1556819&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java (original)
+++ qpid/branches/0.26/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java Thu Jan 9 14:36:35 2014
@@ -127,9 +127,9 @@ public class FrameHandler implements Pro
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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org