You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2015/09/08 17:17:53 UTC
svn commit: r1701820 - in /qpid/java/trunk:
common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java
systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java
Author: orudyy
Date: Tue Sep 8 15:17:53 2015
New Revision: 1701820
URL: http://svn.apache.org/r1701820
Log:
QPID-6727, QPID-6726: Fix failing test MaxTestFrame with 0.9 protocol and correct the exception message
Modified:
qpid/java/trunk/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java?rev=1701820&r1=1701819&r2=1701820&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java Tue Sep 8 15:17:53 2015
@@ -600,7 +600,7 @@ public final class QpidByteBuffer
if (_isPoolInitialized && (bufferSize != _pooledBufferSize || maxPoolSize != _bufferPool.getMaxSize()))
{
final String errorMessage = String.format("QpidByteBuffer pool has already been initialised with bufferSize=%d and maxPoolSize=%d." +
- "Second initialisation with bufferSize=%d and maxPoolSize=%d will be ignored.",
+ "Re-initialisation with different bufferSize=%d and maxPoolSize=%d is not allowed.",
_pooledBufferSize, _bufferPool.getMaxSize(), bufferSize, maxPoolSize);
throw new IllegalStateException(errorMessage);
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java?rev=1701820&r1=1701819&r2=1701820&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java Tue Sep 8 15:17:53 2015
@@ -141,7 +141,7 @@ public class MaxFrameSizeTest extends Qp
TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER,
"secureOnlyMechanisms",
"[]");
- setTestSystemProperty(Broker.NETWORK_BUFFER_SIZE, String.valueOf(Broker.MINIMUM_NETWORK_BUFFER_SIZE));
+
super.setUp();
if(isBroker010())
{
@@ -167,7 +167,7 @@ public class MaxFrameSizeTest extends Qp
}
else
{
- doAMQP08test(Broker.MINIMUM_NETWORK_BUFFER_SIZE + 1, new ResultEvaluator()
+ doAMQP08test(Broker.DEFAULT_NETWORK_BUFFER_SIZE + 1, new ResultEvaluator()
{
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org