[jboss-cvs] JBoss Messaging SVN: r4879 - in branches/Branch_Message_Chunking_new: src/main/org/jboss/messaging/core/client and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 27 08:12:11 EDT 2008
Author: ataylor
Date: 2008-08-27 08:12:11 -0400 (Wed, 27 Aug 2008)
New Revision: 4879
Modified:
branches/Branch_Message_Chunking_new/src/config/jbm-configuration.xml
branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/ConnectionParams.java
branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/impl/ClientMessageImpl.java
branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java
branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java
branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/Packet.java
branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/ConnectionRegistryImpl.java
branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/EncoderImpl.java
branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java
branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/RemotingServiceImpl.java
branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java
branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerSendMessage.java
branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ReceiveMessage.java
branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/jms/client/JBossMessage.java
branches/Branch_Message_Chunking_new/tests/jms-tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTest.java
branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/timing/core/remoting/impl/RemotingConnectionImplTest.java
branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientMessageImplTest.java
branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientSessionImplTest.java
branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConnectionImplTest.java
branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingHandlerImplTest.java
branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java
branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageProducerTest.java
branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java
branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossObjectMessageTest.java
branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossSessionTest.java
branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossTextMessageTest.java
Log:
made max buffer size configurable
Modified: branches/Branch_Message_Chunking_new/src/config/jbm-configuration.xml
===================================================================
--- branches/Branch_Message_Chunking_new/src/config/jbm-configuration.xml 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/src/config/jbm-configuration.xml 2008-08-27 12:12:11 UTC (rev 4879)
@@ -55,12 +55,7 @@
<!-- If no pong is received after this time resources are cleaned up-->
<remoting-ping-timeout>5000</remoting-ping-timeout>
- <!--The initial size of the buffer created for the transport-->
- <remoting-initial-packet-fragment-size>1024</remoting-initial-packet-fragment-size>
-
- <!--The maximum size of packet to send on the transport, except for the first packet which is the r
- emoting-initial-packet-fragment-size parameter. setting to 0 means that packet chunking is disabled-->
- <remoting-packet-fragment-size>1024</remoting-packet-fragment-size>
+ <remoting-max-buffer-size>65536</remoting-max-buffer-size>
<!-- if ssl is enabled, all remoting-ssl-* properties must be set -->
<remoting-enable-ssl>false</remoting-enable-ssl>
Modified: branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/ConnectionParams.java
===================================================================
--- branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/ConnectionParams.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/ConnectionParams.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -83,13 +83,9 @@
String getTrustStorePassword();
- void setTrustStorePassword(String trustStorePassword);
+ void setTrustStorePassword(String trustStorePassword);
- int getPacketFragmentSize();
+ int getMaxBufferSize();
- int getInitialPacketFragmentSize();
-
- void setInitialPacketFragmentSize(int initialPacketFragmentSize);
-
- void setPacketFragmentSize(int packetFragmentSize);
+ void setMaxBufferSize(int maxBufferSize);
}
Modified: branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/impl/ClientMessageImpl.java
===================================================================
--- branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/impl/ClientMessageImpl.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/impl/ClientMessageImpl.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -56,9 +56,11 @@
* Construct messages before sending
*/
public ClientMessageImpl(final byte type, final boolean durable, final long expiration,
- final long timestamp, final byte priority, MessagingBuffer body)
+ final long timestamp, final byte priority, MessagingBuffer body, int maxBufferSize)
{
+
super(type, durable, expiration, timestamp, priority, body);
+ this.maxBufferSize = maxBufferSize;
}
protected void resetBodyForUse()
@@ -69,14 +71,16 @@
}
}
- public ClientMessageImpl(final byte type, final boolean durable, MessagingBuffer body)
+ public ClientMessageImpl(final byte type, final boolean durable, MessagingBuffer body, int maxBufferSize)
{
super(type, durable, 0, System.currentTimeMillis(), (byte)4, body);
+ this.maxBufferSize = maxBufferSize;
}
- public ClientMessageImpl(final boolean durable, MessagingBuffer body)
+ public ClientMessageImpl(final boolean durable, MessagingBuffer body, int maxBufferSize)
{
super((byte) 0, durable, 0, System.currentTimeMillis(), (byte)4, body);
+ this.maxBufferSize = maxBufferSize;
}
/* Only used in testing */
Modified: branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -307,7 +307,7 @@
autoCommitSends, autoCommitAcks, defaultBlockOnAcknowledge,
remotingConnection, this,
dispatcher,
- response.getServerVersion(), cm);
+ response.getServerVersion(), cm, connectionParams.getMaxBufferSize());
}
catch (Throwable t)
{
Modified: branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
===================================================================
--- branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -56,8 +56,6 @@
private boolean trace = log.isTraceEnabled();
- public static final int INITIAL_MESSAGE_BODY_SIZE = 1024;
-
private static final ExecutorFactory executorFactory = new OrderedExecutorFactory(
Executors.newCachedThreadPool(new JBMThreadFactory(
"jbm-client-session-threads")));
@@ -122,6 +120,8 @@
// For testing only
private boolean forceNotSameRM;
+ final private int maxBufferSize;
+
// Constructors
// ---------------------------------------------------------------------------------
@@ -133,7 +133,8 @@
final ClientSessionFactory connectionFactory,
final PacketDispatcher dispatcher,
final int version,
- final CommandManager commandManager)
+ final CommandManager commandManager,
+ final int maxBufferSize)
throws MessagingException
{
if (lazyAckBatchSize < -1 || lazyAckBatchSize == 0)
@@ -179,6 +180,8 @@
this.version = version;
this.connectionRegistry = ConnectionRegistryLocator.getRegistry();
+
+ this.maxBufferSize = maxBufferSize;
}
// ClientSession implementation
@@ -555,26 +558,26 @@
long expiration, long timestamp, byte priority)
{
MessagingBuffer body = remotingConnection
- .createBuffer(INITIAL_MESSAGE_BODY_SIZE);
+ .createBuffer(maxBufferSize);
return new ClientMessageImpl(type, durable, expiration, timestamp,
- priority, body);
+ priority, body, maxBufferSize);
}
public ClientMessage createClientMessage(byte type, boolean durable)
{
MessagingBuffer body = remotingConnection
- .createBuffer(INITIAL_MESSAGE_BODY_SIZE);
+ .createBuffer(maxBufferSize);
- return new ClientMessageImpl(type, durable, body);
+ return new ClientMessageImpl(type, durable, body, maxBufferSize);
}
public ClientMessage createClientMessage(boolean durable)
{
MessagingBuffer body = remotingConnection
- .createBuffer(INITIAL_MESSAGE_BODY_SIZE);
+ .createBuffer(maxBufferSize);
- return new ClientMessageImpl(durable, body);
+ return new ClientMessageImpl(durable, body, maxBufferSize);
}
public boolean isClosed()
Modified: branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java
===================================================================
--- branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -50,9 +50,7 @@
public static final boolean DEFAULT_SSL_ENABLED = false;
- public static final Integer DEFAULT_INITIAL_PACKET_FRAGMENT_SIZE = 2048;
-
- public static final Integer DEFAULT_PACKET_FRAGMENT_SIZE = 1024;
+ public static final int DEFAULT_MAX_BUFFER_SIZE = 1024;
public static final String SSL_KEYSTORE_PATH_PROPERTY_NAME = "jbm.remoting.ssl.keystore.path";
@@ -96,9 +94,7 @@
private String trustStorePassword;
- private int initialPacketFragmentSize = DEFAULT_INITIAL_PACKET_FRAGMENT_SIZE;
-
- private int packetFragmentSize = DEFAULT_PACKET_FRAGMENT_SIZE;
+ private int maxBufferSize = DEFAULT_MAX_BUFFER_SIZE;
public int getPacketConfirmationBatchSize()
{
@@ -240,26 +236,17 @@
this.trustStorePassword = trustStorePassword;
}
- public void setInitialPacketFragmentSize(int initialPacketFragmentSize)
- {
- this.initialPacketFragmentSize = initialPacketFragmentSize;
- }
- public int getInitialPacketFragmentSize()
+ public int getMaxBufferSize()
{
- return initialPacketFragmentSize;
+ return maxBufferSize;
}
- public void setPacketFragmentSize(int packetFragmentSize)
+ public void setMaxBufferSize(int maxBufferSize)
{
- this.packetFragmentSize = packetFragmentSize;
+ this.maxBufferSize = maxBufferSize;
}
- public int getPacketFragmentSize()
- {
- return packetFragmentSize;
- }
-
public boolean equals(Object other)
{
if (other instanceof ConnectionParams == false)
Modified: branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -121,6 +121,8 @@
int pingInterval = getInteger(e, "remoting-ping-interval", ConnectionParamsImpl.DEFAULT_PING_INTERVAL);
+ int maxBufferSize = getInteger(e, "remoting-max-buffer-size", ConnectionParamsImpl.DEFAULT_MAX_BUFFER_SIZE);
+
sslEnabled = getBoolean(e, "remoting-enable-ssl", ConnectionParamsImpl.DEFAULT_SSL_ENABLED);
keyStorePath = getString(e, "remoting-ssl-keystore-path", ConfigurationImpl.DEFAULT_KEYSTORE_PATH);
@@ -146,7 +148,8 @@
defaultConnectionParams.setSSLEnabled(sslEnabled);
defaultConnectionParams.setPacketConfirmationBatchSize(packetConfirmationBatchSize);
-
+
+ defaultConnectionParams.setMaxBufferSize(maxBufferSize);
NodeList interceptorNodes = e.getElementsByTagName("remoting-interceptors");
ArrayList<String> interceptorList = new ArrayList<String>();
Modified: branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java
===================================================================
--- branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -238,7 +238,7 @@
getProperties().decode(buffer);
int len = buffer.getInt();
- buffers.add(new ByteBufferWrapper(ByteBuffer.allocate(PacketImpl.INITIAL_BUFFER_SIZE)));
+ buffers.add(new ByteBufferWrapper(ByteBuffer.allocate(maxBufferSize)));
buffer.transferRemainingBuffer(this, len);
flip();
}
Modified: branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/Packet.java
===================================================================
--- branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/Packet.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/Packet.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -61,7 +61,7 @@
void normalize(Packet other);
- List<MessagingBuffer> encode(Connection connection, int packetId);
+ List<MessagingBuffer> encode(Connection connection, int packetId, int maxBufferSize);
void decode();
Modified: branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/ConnectionRegistryImpl.java
===================================================================
--- branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/ConnectionRegistryImpl.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/ConnectionRegistryImpl.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -114,12 +114,12 @@
if (pingInterval != -1)
{
connection = new RemotingConnectionImpl(tc, dispatcher, location,
- connectionParams.getCallTimeout(), connectionParams.getPingInterval(), pingExecutor);
+ connectionParams.getCallTimeout(), connectionParams.getPingInterval(), connectionParams.getMaxBufferSize(), pingExecutor);
}
else
{
connection = new RemotingConnectionImpl(tc, dispatcher, location,
- connectionParams.getCallTimeout());
+ connectionParams.getCallTimeout(), connectionParams.getMaxBufferSize());
}
remotingConnections.put(tc.getID(), connection);
Modified: branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/EncoderImpl.java
===================================================================
--- branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/EncoderImpl.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/EncoderImpl.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -46,6 +46,7 @@
private int bufferPos = 0;
protected int pos = 0;
protected int bodySize = 0;
+ protected int maxBufferSize;
public void putXidType(Xid xid)
{
@@ -128,7 +129,7 @@
public void putBytes(byte[] bytes, int i, int i1)
{
- if(PacketImpl.MAX_BUFFER_SIZE + PacketImpl.BUFFER_HEADER_SIZE >= currentBuffer.position() + i1)
+ if(getMaxBufferSize() + PacketImpl.BUFFER_HEADER_SIZE >= currentBuffer.position() + i1)
{
currentBuffer.putBytes(bytes, i, i1);
pos += (i1 - i);
@@ -138,7 +139,7 @@
int written = 0;
while(written < i1)
{
- int left = PacketImpl.MAX_BUFFER_SIZE - currentBuffer.position();
+ int left = getMaxBufferSize() - currentBuffer.position();
int towrite = left + written > i1?i1 - written:left;
currentBuffer.putBytes(bytes, i, towrite);
written+=towrite;
@@ -403,8 +404,8 @@
{
bufferPos = 0;
pos = 0;
- MessagingBuffer buff = buffers.get(0).createNewBuffer(PacketImpl.INITIAL_BUFFER_SIZE);
- bodySize = PacketImpl.INITIAL_BUFFER_SIZE;
+ MessagingBuffer buff = buffers.get(0).createNewBuffer(maxBufferSize);
+ bodySize = maxBufferSize;
buffers.clear();
buffers.add(buff);
}
@@ -542,6 +543,11 @@
return size;
}
+ protected int getMaxBufferSize()
+ {
+ return maxBufferSize;
+ }
+
private void checkReadSpace(int size)
{
if(currentBuffer.position() + size > currentBuffer.limit())
@@ -552,7 +558,7 @@
private void checkWriteSpace(int size)
{
- if(currentBuffer.position() + size >= PacketImpl.MAX_BUFFER_SIZE)
+ if(currentBuffer.position() + size >= getMaxBufferSize())
{
setNextFragment();
}
@@ -560,7 +566,7 @@
private void setNextFragment()
{
- MessagingBuffer buffer = buffers.get(0).createNewBuffer(PacketImpl.INITIAL_BUFFER_SIZE + PacketImpl.BUFFER_HEADER_SIZE);
+ MessagingBuffer buffer = buffers.get(0).createNewBuffer(maxBufferSize + PacketImpl.BUFFER_HEADER_SIZE);
buffer.putInt(-1);
buffer.putInt(-1);
buffer.putBoolean(false);
@@ -610,6 +616,7 @@
buffers.add(currentBuffer);
bodySize = 0;
pos = 0;
+ this.maxBufferSize = maxBufferSize;
}
}
Modified: branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java
===================================================================
--- branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -80,12 +80,14 @@
private AtomicInteger packetIdCreator = new AtomicInteger(0);
+ private final int maxBufferSize;
+
// Constructors
// ---------------------------------------------------------------------------------
public RemotingConnectionImpl(final Connection transportConnection,
final PacketDispatcher dispatcher, final Location location,
- final long blockingCallTimeout, final long pingPeriod,
+ final long blockingCallTimeout, final long pingPeriod, final int maxBufferSize,
final ScheduledExecutorService pingExecutor)
{
this.transportConnection = transportConnection;
@@ -96,6 +98,7 @@
this.blockingCallTimeout = blockingCallTimeout;
+ this.maxBufferSize = maxBufferSize;
pinger = new Pinger();
pongHandler = new PongHandler(dispatcher.generateID());
@@ -112,7 +115,7 @@
public RemotingConnectionImpl(final Connection transportConnection,
final PacketDispatcher dispatcher, final Location location,
- final long blockingCallTimeout)
+ final long blockingCallTimeout, final int maxBufferSize)
{
this.transportConnection = transportConnection;
@@ -121,6 +124,8 @@
this.location = location;
this.blockingCallTimeout = blockingCallTimeout;
+
+ this.maxBufferSize = maxBufferSize;
}
// Public
@@ -285,7 +290,7 @@
throw new IllegalStateException("Cannot write packet to connection, it is destroyed");
}
- List<MessagingBuffer> buffers = packet.encode(transportConnection, packetIdCreator.getAndIncrement());
+ List<MessagingBuffer> buffers = packet.encode(transportConnection, packetIdCreator.getAndIncrement(), maxBufferSize);
for (MessagingBuffer buff : buffers)
{
transportConnection.write(buff);
Modified: branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/RemotingServiceImpl.java
===================================================================
--- branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/RemotingServiceImpl.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/RemotingServiceImpl.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -235,7 +235,7 @@
// }
RemotingConnection rc =
- new RemotingConnectionImpl(connection, dispatcher, config.getLocation(), config.getConnectionParams().getCallTimeout());
+ new RemotingConnectionImpl(connection, dispatcher, config.getLocation(), config.getConnectionParams().getCallTimeout(), config.getConnectionParams().getMaxBufferSize());
connections.put(connection.getID(), rc);
}
Modified: branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java
===================================================================
--- branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -47,10 +47,6 @@
public static final long NO_ID_SET = -1L;
- public static final int MAX_BUFFER_SIZE=1450;
-
- public static final int INITIAL_BUFFER_SIZE = 1024;
-
public static final int BUFFER_HEADER_SIZE = 9;
private int commandID;
@@ -198,10 +194,11 @@
setTargetID(other.getResponseTargetID());
}
- public List<MessagingBuffer> encode(Connection connection,int packetId)
+ public synchronized List<MessagingBuffer> encode(Connection connection, int packetId, int maxBufferSize)
{
+ this.maxBufferSize = maxBufferSize;
int encodeSize = getEncodeSize();
- resetBuffers(connection.createBuffer((encodeSize < MAX_BUFFER_SIZE?encodeSize: MAX_BUFFER_SIZE) + PacketImpl.BUFFER_HEADER_SIZE));//The standard header fields);
+ resetBuffers(connection.createBuffer((encodeSize < maxBufferSize?encodeSize: maxBufferSize) + PacketImpl.BUFFER_HEADER_SIZE));//The standard header fields);
//length filled at end
currentBuffer.putInt(-1);
Modified: branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerSendMessage.java
===================================================================
--- branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerSendMessage.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerSendMessage.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -109,10 +109,10 @@
{
Message message = clientMessage!=null?clientMessage:serverMessage;
int headerSize = getHeaderSize(message);
- int sizeLeft = MAX_BUFFER_SIZE - getHeaderEncodeSize() - headerSize;
+ int sizeLeft = getMaxBufferSize() - getHeaderEncodeSize() - headerSize;
while(sizeLeft < 0)
{
- sizeLeft += MAX_BUFFER_SIZE;
+ sizeLeft += getMaxBufferSize();
}
if(message.getBodySize() <= sizeLeft)
{
@@ -128,10 +128,10 @@
{
Message message = clientMessage!=null?clientMessage:serverMessage;
int headerSize = getHeaderSize(message);
- int sizeLeft = MAX_BUFFER_SIZE - getHeaderEncodeSize() - headerSize;
+ int sizeLeft = getMaxBufferSize() - getHeaderEncodeSize() - headerSize;
while(sizeLeft < 0)
{
- sizeLeft += MAX_BUFFER_SIZE;
+ sizeLeft += getMaxBufferSize();
}
if(message.getBodySize() <= sizeLeft)
{
Modified: branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ReceiveMessage.java
===================================================================
--- branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ReceiveMessage.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ReceiveMessage.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -127,10 +127,10 @@
protected int getBodyEncodeSize()
{
int headerSize = getHeaderSize(serverMessage);
- int sizeLeft = MAX_BUFFER_SIZE - getHeaderEncodeSize() - headerSize;
+ int sizeLeft = getMaxBufferSize() - getHeaderEncodeSize() - headerSize;
while(sizeLeft < 0)
{
- sizeLeft += MAX_BUFFER_SIZE;
+ sizeLeft += getMaxBufferSize();
}
if(serverMessage.getBodySize() <= sizeLeft)
{
@@ -158,10 +158,10 @@
{
Message message = clientMessage!=null?clientMessage:serverMessage;
int headerSize = getHeaderSize(message);
- int sizeLeft = MAX_BUFFER_SIZE - getHeaderEncodeSize() - headerSize;
+ int sizeLeft = getMaxBufferSize() - getHeaderEncodeSize() - headerSize;
while(sizeLeft < 0)
{
- sizeLeft += MAX_BUFFER_SIZE;
+ sizeLeft += getMaxBufferSize();
}
if(message.getBodySize() <= sizeLeft)
{
Modified: branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/jms/client/JBossMessage.java
===================================================================
--- branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/jms/client/JBossMessage.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/src/main/org/jboss/messaging/jms/client/JBossMessage.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -163,12 +163,12 @@
*/
public JBossMessage()
{
- message = new ClientMessageImpl(JBossMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, new ByteBufferWrapper(ByteBuffer.allocate(1024)));
+ message = new ClientMessageImpl(JBossMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, new ByteBufferWrapper(ByteBuffer.allocate(1024)), 1024);
}
public JBossMessage(byte type)
{
- message = new ClientMessageImpl(type, true, 0, System.currentTimeMillis(), (byte)4, new ByteBufferWrapper(ByteBuffer.allocate(1024)));
+ message = new ClientMessageImpl(type, true, 0, System.currentTimeMillis(), (byte)4, new ByteBufferWrapper(ByteBuffer.allocate(1024)), 1024);
}
Modified: branches/Branch_Message_Chunking_new/tests/jms-tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTest.java
===================================================================
--- branches/Branch_Message_Chunking_new/tests/jms-tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTest.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/tests/jms-tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTest.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -665,7 +665,7 @@
{
ClientSession session = EasyMock.createNiceMock(ClientSession.class);
ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- ClientMessage clientMessage = new ClientMessageImpl(JBossTextMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
+ ClientMessage clientMessage = new ClientMessageImpl(JBossTextMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body, 1024);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
EasyMock.replay(session);
JBossMessage jbossMessage = new JBossMessage();
@@ -683,7 +683,7 @@
{
ClientSession session = EasyMock.createNiceMock(ClientSession.class);
ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- ClientMessage clientMessage = new ClientMessageImpl(JBossMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
+ ClientMessage clientMessage = new ClientMessageImpl(JBossMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body, 1024);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
EasyMock.replay(session);
@@ -700,7 +700,7 @@
{
ClientSession session = EasyMock.createNiceMock(ClientSession.class);
ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- ClientMessage clientMessage = new ClientMessageImpl(JBossBytesMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
+ ClientMessage clientMessage = new ClientMessageImpl(JBossBytesMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body, 1024);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
EasyMock.replay(session);
@@ -723,7 +723,7 @@
{
ClientSession session = EasyMock.createNiceMock(ClientSession.class);
ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- ClientMessage clientMessage = new ClientMessageImpl(JBossMapMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
+ ClientMessage clientMessage = new ClientMessageImpl(JBossMapMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body, 1024);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
EasyMock.replay(session);
MapMessage foreignMapMessage = new SimpleJMSMapMessage();
@@ -741,7 +741,7 @@
{
ClientSession session = EasyMock.createNiceMock(ClientSession.class);
ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- ClientMessage clientMessage = new ClientMessageImpl(JBossObjectMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
+ ClientMessage clientMessage = new ClientMessageImpl(JBossObjectMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body, 1024);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
EasyMock.replay(session);
@@ -757,7 +757,7 @@
{
ClientSession session = EasyMock.createNiceMock(ClientSession.class);
ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- ClientMessage clientMessage = new ClientMessageImpl(JBossStreamMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
+ ClientMessage clientMessage = new ClientMessageImpl(JBossStreamMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body, 1024);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
EasyMock.replay(session);
@@ -777,7 +777,7 @@
{
ClientSession session = EasyMock.createNiceMock(ClientSession.class);
ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- ClientMessage clientMessage = new ClientMessageImpl(JBossTextMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
+ ClientMessage clientMessage = new ClientMessageImpl(JBossTextMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body, 1024);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
EasyMock.replay(session);
Modified: branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/timing/core/remoting/impl/RemotingConnectionImplTest.java
===================================================================
--- branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/timing/core/remoting/impl/RemotingConnectionImplTest.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/timing/core/remoting/impl/RemotingConnectionImplTest.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -85,7 +85,7 @@
EasyMock.expectLastCall().andAnswer(answer);
MessagingBuffer buff = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- EasyMock.expect(connection.createBuffer(PacketImpl.INITIAL_BUFFER_SIZE)).andStubReturn(buff);
+ EasyMock.expect(connection.createBuffer(1024)).andStubReturn(buff);
final AtomicInteger pongs = new AtomicInteger(0);
@@ -116,7 +116,7 @@
EasyMock.replay(connection, dispatcher);
- RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000L, pingPeriod, ex);
+ RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000L, pingPeriod, 1024, ex);
class Listener implements FailureListener
{
@@ -154,7 +154,7 @@
dispatcher.register(EasyMock.isA(PacketHandler.class));
MessagingBuffer buff = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- EasyMock.expect(connection.createBuffer(PacketImpl.INITIAL_BUFFER_SIZE)).andStubReturn(buff);
+ EasyMock.expect(connection.createBuffer(1024)).andStubReturn(buff);
connection.write(buff);
EasyMock.expectLastCall().anyTimes();
@@ -167,7 +167,7 @@
EasyMock.replay(connection, dispatcher);
- RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000L, pingPeriod, ex);
+ RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000L, pingPeriod, 1024, ex);
class Listener implements FailureListener
{
@@ -222,7 +222,7 @@
EasyMock.expectLastCall().andAnswer(answer);
MessagingBuffer buff = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- EasyMock.expect(connection.createBuffer(PacketImpl.INITIAL_BUFFER_SIZE)).andStubReturn(buff);
+ EasyMock.expect(connection.createBuffer(1024)).andStubReturn(buff);
final Executor queuedEx = Executors.newSingleThreadExecutor();
@@ -258,7 +258,7 @@
EasyMock.replay(connection, dispatcher);
- RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000L, pingPeriod, ex);
+ RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000L, pingPeriod, 1024, ex);
class Listener implements FailureListener
{
@@ -293,7 +293,7 @@
dispatcher.register(EasyMock.isA(PacketHandler.class));
MessagingBuffer buff = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- EasyMock.expect(connection.createBuffer(PacketImpl.INITIAL_BUFFER_SIZE)).andStubReturn(buff);
+ EasyMock.expect(connection.createBuffer(1024)).andStubReturn(buff);
connection.write(buff);
@@ -305,7 +305,7 @@
final long callTimeout = 100;
- RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, callTimeout);
+ RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, callTimeout, 1024);
class Listener implements FailureListener
{
@@ -374,7 +374,7 @@
EasyMock.expectLastCall().andAnswer(answer);
MessagingBuffer buff = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- EasyMock.expect(connection.createBuffer(PacketImpl.INITIAL_BUFFER_SIZE)).andStubReturn(buff);
+ EasyMock.expect(connection.createBuffer(1024)).andStubReturn(buff);
final Executor queuedEx = Executors.newSingleThreadExecutor();
@@ -413,7 +413,7 @@
EasyMock.replay(connection, dispatcher);
- RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, callTimeout);
+ RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, callTimeout, 1024);
class Listener implements FailureListener
{
Modified: branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientMessageImplTest.java
===================================================================
--- branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientMessageImplTest.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientMessageImplTest.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -44,7 +44,7 @@
protected Message createMessage(final byte type, final boolean durable, final long expiration,
final long timestamp, final byte priority, MessagingBuffer buffer)
{
- return new ClientMessageImpl(type, durable, expiration, timestamp, priority, buffer);
+ return new ClientMessageImpl(type, durable, expiration, timestamp, priority, buffer, 1024);
}
protected Message createMessage()
@@ -85,7 +85,7 @@
ByteBuffer bb = ByteBuffer.wrap(new byte[1000]);
MessagingBuffer body = new ByteBufferWrapper(bb);
- ClientMessage msg = new ClientMessageImpl(durable, body);
+ ClientMessage msg = new ClientMessageImpl(durable, body, 1024);
assertEquals(durable, msg.isDurable());
assertEquals(0, msg.getType());
@@ -104,7 +104,7 @@
ByteBuffer bb = ByteBuffer.wrap(new byte[1000]);
MessagingBuffer body = new ByteBufferWrapper(bb);
- ClientMessage msg = new ClientMessageImpl(type, durable, body);
+ ClientMessage msg = new ClientMessageImpl(type, durable, body, 1024);
assertEquals(type, msg.getType());
assertEquals(durable, msg.isDurable());
@@ -126,7 +126,7 @@
long timestamp = RandomUtil.randomLong();
byte priority = RandomUtil.randomByte();
- ClientMessage msg = new ClientMessageImpl(type, durable, expiration, timestamp, priority, body);
+ ClientMessage msg = new ClientMessageImpl(type, durable, expiration, timestamp, priority, body, 1024);
assertEquals(type, msg.getType());
assertEquals(durable, msg.isDurable());
assertEquals(expiration, msg.getExpiration());
Modified: branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientSessionImplTest.java
===================================================================
--- branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientSessionImplTest.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientSessionImplTest.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -69,7 +69,7 @@
try
{
- new ClientSessionImpl("blah", 1, false, -2, false, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", 1, false, -2, false, false, false, false, rc, cf, pd, 100, cm, 1024);
fail("Should throw exception");
}
catch (IllegalArgumentException e)
@@ -79,7 +79,7 @@
try
{
- new ClientSessionImpl("blah", 1, false, -10, false, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", 1, false, -10, false, false, false, false, rc, cf, pd, 100, cm, 1024);
fail("Should throw exception");
}
catch (IllegalArgumentException e)
@@ -89,7 +89,7 @@
try
{
- new ClientSessionImpl("blah", 1, false, 0, false, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", 1, false, 0, false, false, false, false, rc, cf, pd, 100, cm, 1024);
fail("Should throw exception");
}
catch (IllegalArgumentException e)
@@ -115,7 +115,7 @@
EasyMock.replay(rc, cf, pd);
ClientSession session =
- new ClientSessionImpl("blah", targetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", targetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
session.createQueue(request.getAddress(), request.getQueueName(), request.getFilterString(), request.isDurable(), request.isDurable());
@@ -135,13 +135,13 @@
EasyMock.expect(cm.sendCommandBlocking(targetID, request)).andReturn(null);
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
- ClientSession session = new ClientSessionImpl("blah", targetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ ClientSession session = new ClientSessionImpl("blah", targetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
session.deleteQueue(request.getQueueName());
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
}
public void testQueueQuery() throws Exception
@@ -159,13 +159,13 @@
EasyMock.expect(cm.sendCommandBlocking(targetID, request)).andReturn(resp);
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
- ClientSession session = new ClientSessionImpl("blah", targetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ ClientSession session = new ClientSessionImpl("blah", targetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
SessionQueueQueryResponseMessage resp2 = session.queueQuery(request.getQueueName());
- EasyMock.verify(rc, rc, cf, pd, cm);
+ EasyMock.verify(rc, rc, cf, pd, cm, 1024);
assertTrue(resp == resp2);
}
@@ -185,13 +185,13 @@
EasyMock.expect(cm.sendCommandBlocking(targetID, request)).andReturn(resp);
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
- ClientSession session = new ClientSessionImpl("blah", targetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ ClientSession session = new ClientSessionImpl("blah", targetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
SessionBindingQueryResponseMessage resp2 = session.bindingQuery(request.getAddress());
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
assertTrue(resp == resp2);
}
@@ -209,13 +209,13 @@
EasyMock.expect(cm.sendCommandBlocking(targetID, request)).andReturn(null);
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
- ClientSession session = new ClientSessionImpl("blah", targetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ ClientSession session = new ClientSessionImpl("blah", targetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
session.addDestination(request.getAddress(), request.isDurable(), request.isTemporary());
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
}
public void testRemoveDestination() throws Exception
@@ -231,13 +231,13 @@
EasyMock.expect(cm.sendCommandBlocking(targetID, request)).andReturn(null);
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
- ClientSession session = new ClientSessionImpl("blah", targetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ ClientSession session = new ClientSessionImpl("blah", targetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
session.removeDestination(request.getAddress(), true);
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
}
public void testCreateConsumer() throws Exception
@@ -414,12 +414,12 @@
pd.register(new ClientProducerPacketHandler(null, clientTargetID, null));
}
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
//Create three with address1 - only one should be actually created
ClientSessionInternal session =
- new ClientSessionImpl("blah", sessionTargetID, false, -1, true, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", sessionTargetID, false, -1, true, false, false, false, rc, cf, pd, 100, cm, 1024);
assertEquals(0, session.getProducerCache().size());
@@ -461,7 +461,7 @@
assertEquals(2, session.getProducerCache().size());
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
assertTrue(producer1 == producer2);
assertTrue(producer2 == producer3);
@@ -501,10 +501,10 @@
pd.register(new ClientProducerPacketHandler(null, clientTargetID, null));
}
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
ClientSessionInternal session =
- new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
ClientProducerInternal producer1 = (ClientProducerInternal)session.createProducer(address, windowSize, maxRate,
false, false);
@@ -518,7 +518,7 @@
false, false);
session.removeProducer(producer3);
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
assertFalse(producer1 == producer2);
assertFalse(producer2 == producer3);
@@ -538,7 +538,7 @@
PacketDispatcher pd = EasyMock.createStrictMock(PacketDispatcher.class);
CommandManager cm = EasyMock.createStrictMock(CommandManager.class);
- ClientSession session = new ClientSessionImpl("blah", 5465, false, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ ClientSession session = new ClientSessionImpl("blah", 5465, false, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
XAResource res = session.getXAResource();
@@ -576,10 +576,10 @@
EasyMock.expect(cm.sendCommandBlocking(sessionTargetID, new PacketImpl(PacketImpl.SESS_ROLLBACK))).andReturn(null);
- EasyMock.replay(rc, cf, pd, cons1, cons2, cm);
+ EasyMock.replay(rc, cf, pd, cons1, cons2, cm, 1024);
ClientSessionInternal session =
- new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
session.addConsumer(cons1);
session.addConsumer(cons2);
@@ -606,7 +606,7 @@
session.rollback();
- EasyMock.verify(rc, cf, pd, cons1, cons2, cm);
+ EasyMock.verify(rc, cf, pd, cons1, cons2, cm, 1024);
}
public void testAutoCommitSessionAcknowledge() throws Exception
@@ -641,10 +641,10 @@
EasyMock.expect(cm.sendCommandBlocking(sessionTargetID, new PacketImpl(PacketImpl.SESS_COMMIT))).andReturn(null);
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
ClientSessionInternal session =
- new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
//Simulate some messages being delivered in a non broken sequence (i.e. what would happen with a single consumer
//on the session)
@@ -659,7 +659,7 @@
//Then commit
session.commit();
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
}
public void testTransactedSessionAcknowledgeBrokenExpired() throws Exception
@@ -682,10 +682,10 @@
EasyMock.expect(cm.sendCommandBlocking(sessionTargetID, new PacketImpl(PacketImpl.SESS_COMMIT))).andReturn(null);
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
ClientSessionInternal session =
- new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
//Simulate some messages being delivered in a broken sequence (i.e. what would happen with a single consumer
//on the session)
@@ -700,7 +700,7 @@
//Then commit
session.commit();
- EasyMock.verify(rc, cf, pd, cm);;
+ EasyMock.verify(rc, cf, pd, cm, 1024);;
}
public void testCleanUp2() throws Exception
@@ -717,7 +717,7 @@
EasyMock.replay(rc, cf, pd, cm, reg);
ClientSessionImpl session =
- new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
session.setConnectionRegistry(reg);
EasyMock.verify(rc, cf, pd, cm, reg);
@@ -785,14 +785,14 @@
final long sessionTargetID = 9121892;
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
ClientSessionInternal session =
- new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
- EasyMock.reset(rc, cf, pd, cm);
+ EasyMock.reset(rc, cf, pd, cm, 1024);
ClientProducerInternal prod1 = EasyMock.createStrictMock(ClientProducerInternal.class);
ClientProducerInternal prod2 = EasyMock.createStrictMock(ClientProducerInternal.class);
@@ -823,14 +823,14 @@
final long sessionTargetID = 9121892;
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
ClientSessionInternal session =
- new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
- EasyMock.reset(rc, cf, pd, cm);
+ EasyMock.reset(rc, cf, pd, cm, 1024);
ClientBrowser browser1 = EasyMock.createStrictMock(ClientBrowser.class);
ClientBrowser browser2 = EasyMock.createStrictMock(ClientBrowser.class);
@@ -893,14 +893,14 @@
EasyMock.expect(cm.sendCommandBlocking(sessionTargetID, packet)).andReturn(resp);
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
ClientSessionInternal session =
- new ClientSessionImpl("blah", sessionTargetID, true, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", sessionTargetID, true, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
int timeout2 = session.getTransactionTimeout();
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
assertEquals(timeout, timeout2);
}
@@ -919,16 +919,16 @@
EasyMock.expect(rc1.getLocation()).andStubReturn(location1);
EasyMock.expect(rc2.getLocation()).andStubReturn(location2);
- EasyMock.replay(rc1, rc2, cf, pd, cm);
+ EasyMock.replay(rc1, rc2, cf, pd, cm, 1024);
ClientSessionInternal session1 =
- new ClientSessionImpl("blah", 4343, true, -1, false, false, false, false, rc1, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", 4343, true, -1, false, false, false, false, rc1, cf, pd, 100, cm, 1024);
ClientSessionInternal session2 =
- new ClientSessionImpl("blah2", 4343, true, -1, false, false, false, false, rc2, cf, pd, 100, cm);
+ new ClientSessionImpl("blah2", 4343, true, -1, false, false, false, false, rc2, cf, pd, 100, cm, 1024);
ClientSessionInternal session3 =
- new ClientSessionImpl("blah3", 4343, true, -1, false, false, false, false, rc2, cf, pd, 100, cm);
+ new ClientSessionImpl("blah3", 4343, true, -1, false, false, false, false, rc2, cf, pd, 100, cm, 1024);
assertFalse(session1.isSameRM(session2));
assertFalse(session2.isSameRM(session1));
@@ -943,7 +943,7 @@
assertTrue(session2.isSameRM(session2));
assertTrue(session3.isSameRM(session3));
- EasyMock.verify(rc1, rc2, cf, pd, cm);
+ EasyMock.verify(rc1, rc2, cf, pd, cm, 1024);
}
public void testXAPrepare() throws Exception
@@ -1000,22 +1000,22 @@
EasyMock.expect(cm.sendCommandBlocking(targetID, request)).andReturn(null);
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
- ClientSessionImpl session = new ClientSessionImpl("blah", targetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ ClientSessionImpl session = new ClientSessionImpl("blah", targetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
session.setConnectionRegistry(reg);
session.createQueue(request.getAddress(), request.getQueueName(), request.getFilterString(), request.isDurable(), request.isDurable());
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
- EasyMock.reset(rc, cf, pd, cm);
+ EasyMock.reset(rc, cf, pd, cm, 1024);
cm.close();
EasyMock.expect(rc.getLocation()).andReturn(location);
reg.returnConnection(location);
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
session.cleanUp();
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
}
public void notXA() throws Exception
@@ -1027,13 +1027,13 @@
final long sessionTargetID = 9121892;
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
- ClientSessionInternal session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ ClientSessionInternal session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
- EasyMock.reset(rc, cf, pd, cm);
+ EasyMock.reset(rc, cf, pd, cm, 1024);
try
{
session.commit(randomXid(), false);
@@ -1142,11 +1142,11 @@
PacketDispatcher pd = EasyMock.createStrictMock(PacketDispatcher.class);
MessagingBuffer buff = EasyMock.createMock(MessagingBuffer.class);
CommandManager cm = EasyMock.createStrictMock(CommandManager.class);
- EasyMock.expect(rc.createBuffer(ClientSessionImpl.INITIAL_MESSAGE_BODY_SIZE)).andStubReturn(buff);
+ EasyMock.expect(rc.createBuffer(1024)).andStubReturn(buff);
EasyMock.replay(rc);
ClientSessionInternal session =
- new ClientSessionImpl("blah", 453543, false, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", 453543, false, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
ClientMessage msg = session.createClientMessage(false);
assertFalse(msg.isDurable());
@@ -1195,15 +1195,15 @@
final long sessionTargetID = 9121892;
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
ClientSessionImpl session =
- new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
session.setConnectionRegistry(reg);
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
- EasyMock.reset(rc, cf, pd, cm);
+ EasyMock.reset(rc, cf, pd, cm, 1024);
ClientProducerInternal prod1 = EasyMock.createStrictMock(ClientProducerInternal.class);
ClientProducerInternal prod2 = EasyMock.createStrictMock(ClientProducerInternal.class);
@@ -1238,7 +1238,7 @@
EasyMock.expect(rc.getLocation()).andStubReturn(location);
reg.returnConnection(location);
- EasyMock.replay(rc, cf, pd, prod1, prod2, cons1, cons2, browser1, browser2, cm);
+ EasyMock.replay(rc, cf, pd, prod1, prod2, cons1, cons2, browser1, browser2, cm, 1024);
session.addProducer(prod1);
session.addProducer(prod2);
@@ -1263,19 +1263,19 @@
session.close();
- EasyMock.verify(rc, cf, pd, prod1, prod2, cons1, cons2, browser1, browser2, cm);
+ EasyMock.verify(rc, cf, pd, prod1, prod2, cons1, cons2, browser1, browser2, cm, 1024);
assertTrue(session.isClosed());
- EasyMock.reset(rc, cf, pd, prod1, prod2, cons1, cons2, browser1, browser2, cm);
+ EasyMock.reset(rc, cf, pd, prod1, prod2, cons1, cons2, browser1, browser2, cm, 1024);
- EasyMock.replay(rc, cf, pd, prod1, prod2, cons1, cons2, browser1, browser2, cm);
+ EasyMock.replay(rc, cf, pd, prod1, prod2, cons1, cons2, browser1, browser2, cm, 1024);
//Close again should do nothing
session.close();
- EasyMock.verify(rc, cf, pd, prod1, prod2, cons1, cons2, browser1, browser2, cm);
+ EasyMock.verify(rc, cf, pd, prod1, prod2, cons1, cons2, browser1, browser2, cm, 1024);
try
{
@@ -1497,9 +1497,9 @@
EasyMock.expect(cm.sendCommandBlocking(sessionTargetID, packet)).andReturn(resp);
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
- ClientSessionInternal session = new ClientSessionImpl("blah", sessionTargetID, true, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ ClientSessionInternal session = new ClientSessionImpl("blah", sessionTargetID, true, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
//Simulate some unflushed messages
@@ -1526,7 +1526,7 @@
session.start(xid, flags);
}
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
}
private void testXASetTransactionTimeout(boolean error) throws Exception
@@ -1546,16 +1546,16 @@
EasyMock.expect(cm.sendCommandBlocking(sessionTargetID, packet)).andReturn(resp);
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
ClientSessionInternal session =
- new ClientSessionImpl("blah", sessionTargetID, true, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", sessionTargetID, true, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
boolean ok = session.setTransactionTimeout(timeout);
assertTrue(ok == !error);
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
}
private void testXARollback(boolean error) throws Exception
@@ -1575,10 +1575,10 @@
EasyMock.expect(cm.sendCommandBlocking(sessionTargetID, packet)).andReturn(resp);
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
ClientSessionInternal session =
- new ClientSessionImpl("blah", sessionTargetID, true, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", sessionTargetID, true, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
if (error)
{
@@ -1597,7 +1597,7 @@
session.rollback(xid);
}
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
}
private void testXARecover(final int flags) throws Exception
@@ -1620,10 +1620,10 @@
EasyMock.expect(cm.sendCommandBlocking(sessionTargetID, packet)).andReturn(resp);
}
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
ClientSessionInternal session =
- new ClientSessionImpl("blah", sessionTargetID, true, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", sessionTargetID, true, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
Xid[] xids2 = session.recover(flags);
@@ -1641,7 +1641,7 @@
assertTrue(xids2.length == 0);
}
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
}
private void testXAPrepare(boolean error, boolean readOnly) throws Exception
@@ -1661,10 +1661,10 @@
EasyMock.expect(cm.sendCommandBlocking(sessionTargetID, packet)).andReturn(resp);
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
ClientSessionInternal session =
- new ClientSessionImpl("blah", sessionTargetID, true, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", sessionTargetID, true, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
if (error)
{
@@ -1692,7 +1692,7 @@
}
}
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
}
private void testXAForget(final boolean error) throws Exception
@@ -1718,10 +1718,10 @@
EasyMock.expect(cm.sendCommandBlocking(sessionTargetID, packet)).andReturn(resp);
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
ClientSessionInternal session =
- new ClientSessionImpl("blah", sessionTargetID, true, -1, false, false, false, false, rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", sessionTargetID, true, -1, false, false, false, false, rc, cf, pd, 100, cm, 1024);
//Simulate some unflushed messages
@@ -1748,7 +1748,7 @@
session.forget(xid);
}
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
}
private void testXAEnd(int flags, boolean error) throws Exception
@@ -1786,9 +1786,9 @@
EasyMock.expect(cm.sendCommandBlocking(sessionTargetID, packet)).andReturn(resp);
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
- ClientSessionInternal session = new ClientSessionImpl("blah", sessionTargetID, true, -1, false, false, false, false,rc, cf, pd, 100, cm);
+ ClientSessionInternal session = new ClientSessionImpl("blah", sessionTargetID, true, -1, false, false, false, false,rc, cf, pd, 100, cm, 1024);
//Simulate some unflushed messages
@@ -1815,7 +1815,7 @@
session.end(xid, flags);
}
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
}
private void testXACommit(boolean onePhase, boolean error) throws Exception
@@ -1835,9 +1835,9 @@
EasyMock.expect(cm.sendCommandBlocking(sessionTargetID, packet)).andReturn(resp);
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
- ClientSessionInternal session = new ClientSessionImpl("blah", sessionTargetID, true, -1, false, false, false, false,rc, cf, pd, 100, cm);
+ ClientSessionInternal session = new ClientSessionImpl("blah", sessionTargetID, true, -1, false, false, false, false,rc, cf, pd, 100, cm, 1024);
if (error)
{
@@ -1856,7 +1856,7 @@
session.commit(xid, onePhase);
}
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
}
private void testAddRemoveConsumer(boolean delivered) throws Exception
@@ -1869,13 +1869,13 @@
final long sessionTargetID = 9121892;
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
- ClientSessionInternal session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false,rc, cf, pd, 100, cm);
+ ClientSessionInternal session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false,rc, cf, pd, 100, cm, 1024);
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
- EasyMock.reset(rc, cf, pd, cm);
+ EasyMock.reset(rc, cf, pd, cm, 1024);
final int numDeliveries = 10;
@@ -1890,7 +1890,7 @@
cm.sendCommandOneway(sessionTargetID, new SessionCancelMessage(-1, false));
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
ClientConsumerInternal cons1 = EasyMock.createStrictMock(ClientConsumerInternal.class);
ClientConsumerInternal cons2 = EasyMock.createStrictMock(ClientConsumerInternal.class);
@@ -1920,7 +1920,7 @@
session.removeConsumer(cons2);
assertEquals(0, session.getConsumers().size());
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
}
private void testAutoCommitSessionAcknowledge(boolean blockOnAcknowledge) throws Exception
@@ -1974,10 +1974,10 @@
EasyMock.expect(cm.sendCommandBlocking(sessionTargetID, new PacketImpl(PacketImpl.SESS_ROLLBACK))).andReturn(null);
- EasyMock.replay(rc, cf, pd, cons1, cons2, cm);
+ EasyMock.replay(rc, cf, pd, cons1, cons2, cm, 1024);
ClientSessionInternal session =
- new ClientSessionImpl("blah", sessionTargetID, false, batchSize, false, false, true, blockOnAcknowledge,rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", sessionTargetID, false, batchSize, false, false, true, blockOnAcknowledge,rc, cf, pd, 100, cm, 1024);
session.addConsumer(cons1);
@@ -2005,7 +2005,7 @@
session.rollback();
- EasyMock.verify(rc, cf, pd, cons1, cons2, cm);
+ EasyMock.verify(rc, cf, pd, cons1, cons2, cm, 1024);
}
private void testTransactedSessionAcknowledgeBroken(boolean blockOnAcknowledge) throws Exception
@@ -2061,10 +2061,10 @@
EasyMock.expect(cm.sendCommandBlocking(sessionTargetID, new PacketImpl(PacketImpl.SESS_ROLLBACK))).andReturn(null);
- EasyMock.replay(rc, cf, pd, cons1, cons2, cm);
+ EasyMock.replay(rc, cf, pd, cons1, cons2, cm, 1024);
ClientSessionInternal session =
- new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, blockOnAcknowledge,rc, cf, pd, 100, cm);
+ new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, blockOnAcknowledge,rc, cf, pd, 100, cm, 1024);
session.addConsumer(cons1);
session.addConsumer(cons2);
@@ -2091,7 +2091,7 @@
session.rollback();
- EasyMock.verify(rc, cf, pd, cons1, cons2, cm);
+ EasyMock.verify(rc, cf, pd, cons1, cons2, cm, 1024);
}
private void testCreateBrowser(boolean filter) throws Exception
@@ -2114,9 +2114,9 @@
EasyMock.expect(cm.sendCommandBlocking(sessionTargetID, request)).andReturn(resp);
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
- ClientSessionInternal session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false,rc, cf, pd, 100, cm);
+ ClientSessionInternal session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false,rc, cf, pd, 100, cm, 1024);
if (filter)
{
@@ -2127,7 +2127,7 @@
ClientBrowser browser = session.createBrowser(queueName);
}
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
}
private void testCreateProducerWithWindowSizeMethod(final SimpleString address,
@@ -2166,13 +2166,13 @@
pd.register(new ClientProducerPacketHandler(null, clientTargetID, null));
- EasyMock.replay(cf, rc, pd, cm);
+ EasyMock.replay(cf, rc, pd, cm, 1024);
- ClientSession session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, autoCommitSends, false, false,rc, cf, pd, 100, cm);
+ ClientSession session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, autoCommitSends, false, false,rc, cf, pd, 100, cm, 1024);
ClientProducerInternal producer = (ClientProducerInternal)session.createProducerWithWindowSize(address, windowSize);
- EasyMock.verify(cf, rc, pd, cm);
+ EasyMock.verify(cf, rc, pd, cm, 1024);
assertEquals(address, producer.getAddress());
assertEquals(autoCommitSends && blockOnNPSend, producer.isBlockOnNonPersistentSend());
@@ -2216,13 +2216,13 @@
pd.register(new ClientProducerPacketHandler(null, clientTargetID, null));
- EasyMock.replay(cf, rc, pd, cm);
+ EasyMock.replay(cf, rc, pd, cm, 1024);
- ClientSession session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, autoCommitSends, false, false,rc, cf, pd, 100, cm);
+ ClientSession session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, autoCommitSends, false, false,rc, cf, pd, 100, cm, 1024);
ClientProducerInternal producer = (ClientProducerInternal)session.createRateLimitedProducer(address, maxRate);
- EasyMock.verify(cf, rc, pd, cm);
+ EasyMock.verify(cf, rc, pd, cm, 1024);
assertEquals(address, producer.getAddress());
assertEquals(autoCommitSends && blockOnNPSend, producer.isBlockOnNonPersistentSend());
@@ -2270,13 +2270,13 @@
pd.register(new ClientProducerPacketHandler(null, clientTargetID, null));
- EasyMock.replay(cf, rc, pd, cm);
+ EasyMock.replay(cf, rc, pd, cm, 1024);
- ClientSession session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, autoCommitSends, false, false,rc, cf, pd, 100, cm);
+ ClientSession session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, autoCommitSends, false, false,rc, cf, pd, 100, cm, 1024);
ClientProducerInternal producer = (ClientProducerInternal)session.createProducer(address);
- EasyMock.verify(cf, rc, pd, cm);
+ EasyMock.verify(cf, rc, pd, cm, 1024);
assertEquals(address, producer.getAddress());
assertEquals(autoCommitSends && blockOnNPSend, producer.isBlockOnNonPersistentSend());
@@ -2314,13 +2314,13 @@
pd.register(new ClientProducerPacketHandler(null, clientTargetID, null));
- EasyMock.replay(cf, rc, pd, cm);
+ EasyMock.replay(cf, rc, pd, cm, 1024);
- ClientSession session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, autoCommitSends, false, false,rc, cf, pd, 100, cm);
+ ClientSession session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, autoCommitSends, false, false,rc, cf, pd, 100, cm, 1024);
ClientProducerInternal producer = (ClientProducerInternal)session.createProducer(address, windowSize, maxRate, blockOnNPSend, blockOnPSend);
- EasyMock.verify(cf, rc, pd, cm);
+ EasyMock.verify(cf, rc, pd, cm, 1024);
assertEquals(address, producer.getAddress());
assertEquals(autoCommitSends && blockOnNPSend, producer.isBlockOnNonPersistentSend());
@@ -2363,13 +2363,13 @@
cm.sendCommandOneway(resp.getConsumerTargetID(),
new ConsumerFlowCreditMessage(resp.getWindowSize()));
- EasyMock.replay(cf, rc, pd, cm);
- ClientSession session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false,rc, cf, pd, 100, cm);
+ EasyMock.replay(cf, rc, pd, cm, 1024);
+ ClientSession session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false,rc, cf, pd, 100, cm, 1024);
ClientConsumerInternal consumer =
(ClientConsumerInternal)session.createConsumer(queueName, filterString,
direct);
- EasyMock.verify(cf, rc, pd, cm);
+ EasyMock.verify(cf, rc, pd, cm, 1024);
assertEquals(clientTargetID, consumer.getClientTargetID());
@@ -2417,13 +2417,13 @@
cm.sendCommandOneway(resp.getConsumerTargetID(),
new ConsumerFlowCreditMessage(resp.getWindowSize()));
- EasyMock.replay(cf, rc, pd, cm);
+ EasyMock.replay(cf, rc, pd, cm, 1024);
- ClientSession session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false,rc, cf, pd, 100, cm);
+ ClientSession session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false,rc, cf, pd, 100, cm, 1024);
ClientConsumerInternal consumer = (ClientConsumerInternal)session.createConsumer(queueName, filterString,
direct, windowSize, maxRate);
- EasyMock.verify(cf, rc, pd, cm);
+ EasyMock.verify(cf, rc, pd, cm, 1024);
assertEquals(clientTargetID, consumer.getClientTargetID());
@@ -2474,12 +2474,12 @@
cm.sendCommandOneway(resp.getConsumerTargetID(),
new ConsumerFlowCreditMessage(resp.getWindowSize()));
- EasyMock.replay(cf, rc, pd, cm);
+ EasyMock.replay(cf, rc, pd, cm, 1024);
- ClientSession session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false,rc, cf, pd, 100, cm);
+ ClientSession session = new ClientSessionImpl("blah", sessionTargetID, false, -1, false, false, false, false,rc, cf, pd, 100, cm, 1024);
ClientConsumerInternal consumer = (ClientConsumerInternal)session.createConsumer(queueName);
- EasyMock.verify(cf, rc, pd, cm);
+ EasyMock.verify(cf, rc, pd, cm, 1024);
assertEquals(clientTargetID, consumer.getClientTargetID());
@@ -2509,13 +2509,13 @@
PacketDispatcher pd = EasyMock.createStrictMock(PacketDispatcher.class);
CommandManager cm = EasyMock.createStrictMock(CommandManager.class);
- EasyMock.replay(rc, cf, pd, cm);
+ EasyMock.replay(rc, cf, pd, cm, 1024);
ClientSessionInternal session = new ClientSessionImpl("blah", serverTargetID, xa,
lazyAckBatchSize, cacheProducers, autoCommitSends, autoCommitAcks, blockOnAcknowledge,
- rc, cf, pd, version, cm);
+ rc, cf, pd, version, cm, 1024);
- EasyMock.verify(rc, cf, pd, cm);
+ EasyMock.verify(rc, cf, pd, cm, 1024);
assertEquals(xa, session.isXA());
assertEquals(lazyAckBatchSize, session.getLazyAckBatchSize());
Modified: branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConnectionImplTest.java
===================================================================
--- branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConnectionImplTest.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConnectionImplTest.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -57,7 +57,7 @@
final long id = 12123;
EasyMock.expect(connection.getID()).andReturn(id);
- RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000);
+ RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000, 1024);
EasyMock.replay(connection, dispatcher);
@@ -80,15 +80,15 @@
MessagingBuffer buff = EasyMock.createMock(MessagingBuffer.class);
- EasyMock.expect(connection.createBuffer(PacketImpl.INITIAL_BUFFER_SIZE)).andReturn(buff);
+ EasyMock.expect(connection.createBuffer(1024)).andReturn(buff);
- packet.encode(connection, 0);
+ packet.encode(connection, 0, 1024);
connection.write(buff);
EasyMock.replay(connection, dispatcher, packet, buff);
- RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000);
+ RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000, 1024);
rc.sendOneWay(targetID, executorID, packet);
@@ -104,15 +104,15 @@
MessagingBuffer buff = EasyMock.createMock(MessagingBuffer.class);
- EasyMock.expect(connection.createBuffer(PacketImpl.INITIAL_BUFFER_SIZE)).andReturn(buff);
+ EasyMock.expect(connection.createBuffer(1024)).andReturn(buff);
- packet.encode(connection, 0);
+ packet.encode(connection, 0, 1024);
connection.write(buff);
EasyMock.replay(connection, dispatcher, packet, buff);
- RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000);
+ RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000, 1024);
rc.sendOneWay(packet);
@@ -129,7 +129,7 @@
EasyMock.replay(connection, dispatcher);
- RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000);
+ RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000, 1024);
class Listener implements FailureListener
{
@@ -194,7 +194,7 @@
EasyMock.replay(connection, dispatcher);
- RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000);
+ RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000, 1024);
class Listener implements FailureListener
{
@@ -237,7 +237,7 @@
EasyMock.replay(connection, dispatcher, buff);
- RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000);
+ RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000, 1024);
MessagingBuffer buff2 = rc.createBuffer(size);
@@ -250,7 +250,7 @@
PacketDispatcher dispatcher = EasyMock.createStrictMock(PacketDispatcher.class);
Location location = new LocationImpl(TransportType.TCP, "blah", 1234);
- RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000);
+ RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000, 1024);
assertTrue(location == rc.getLocation());
}
@@ -261,7 +261,7 @@
PacketDispatcher dispatcher = EasyMock.createStrictMock(PacketDispatcher.class);
Location location = new LocationImpl(TransportType.TCP, "blah", 1234);
- RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000);
+ RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000, 1024);
assertTrue(dispatcher == rc.getPacketDispatcher());
}
@@ -276,7 +276,7 @@
EasyMock.replay(connection, dispatcher);
- RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000);
+ RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000, 1024);
rc.destroy();
@@ -318,7 +318,7 @@
EasyMock.replay(connection, dispatcher, ex);
- RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, pingPeriod, pingPeriod, ex);
+ RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, pingPeriod, pingPeriod, 1024, ex);
rc.destroy();
@@ -363,7 +363,7 @@
EasyMock.expectLastCall().andAnswer(answer);
MessagingBuffer buff = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- EasyMock.expect(connection.createBuffer(PacketImpl.INITIAL_BUFFER_SIZE)).andStubReturn(buff);
+ EasyMock.expect(connection.createBuffer(1024)).andStubReturn(buff);
final Executor queuedEx = Executors.newSingleThreadExecutor();
@@ -391,7 +391,7 @@
EasyMock.replay(connection, dispatcher);
- RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000L);
+ RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000, 1024);
class Listener implements FailureListener
{
@@ -450,7 +450,7 @@
EasyMock.expectLastCall().andAnswer(answer);
MessagingBuffer buff = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- EasyMock.expect(connection.createBuffer(PacketImpl.INITIAL_BUFFER_SIZE)).andStubReturn(buff);
+ EasyMock.expect(connection.createBuffer(1024)).andStubReturn(buff);
final Executor queuedEx = Executors.newSingleThreadExecutor();
@@ -485,7 +485,7 @@
EasyMock.replay(connection, dispatcher);
- RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000L);
+ RemotingConnection rc = new RemotingConnectionImpl(connection, dispatcher, location, 1000L, 1024);
class Listener implements FailureListener
{
Modified: branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingHandlerImplTest.java
===================================================================
--- branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingHandlerImplTest.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingHandlerImplTest.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -128,7 +128,7 @@
EasyMock.replay(dispatcher, connection);
- packet.encode(connection, 0);
+ packet.encode(connection, 0, 1024);
buff.getInt();
@@ -155,7 +155,7 @@
EasyMock.expectLastCall().times(numTimes);
EasyMock.replay(dispatcher, connection);
- packet.encode(connection, 0);
+ packet.encode(connection, 0, 1024);
buff.getInt();
@@ -375,7 +375,7 @@
public void testProducerSendMessageNullBodyNoProps2() throws Exception
{
ClientMessageImpl message1 = new ClientMessageImpl(RandomUtil.randomByte(), RandomUtil.randomBoolean(),
- RandomUtil.randomLong(), RandomUtil.randomLong(), RandomUtil.randomByte(), new ByteBufferWrapper(ByteBuffer.allocate(0)));
+ RandomUtil.randomLong(), RandomUtil.randomLong(), RandomUtil.randomByte(), new ByteBufferWrapper(ByteBuffer.allocate(0)), 1024);
message1.setDestination(new SimpleString("test"));
PacketImpl message = new ProducerSendMessage(message1);
setHeaders(message);
@@ -394,7 +394,7 @@
public void testProducerSendMessageNullBodyNoProps3() throws Exception
{
- ClientMessageImpl message1 = new ClientMessageImpl(RandomUtil.randomByte(), RandomUtil.randomBoolean(), new ByteBufferWrapper(ByteBuffer.allocate(0)));
+ ClientMessageImpl message1 = new ClientMessageImpl(RandomUtil.randomByte(), RandomUtil.randomBoolean(), new ByteBufferWrapper(ByteBuffer.allocate(0)), 1024);
message1.setDestination(new SimpleString("test"));
PacketImpl message = new ProducerSendMessage(message1);
setHeaders(message);
@@ -414,7 +414,7 @@
public void testProducerSendMessageNullBodyNoProps4() throws Exception
{
- ClientMessageImpl message1 = new ClientMessageImpl(RandomUtil.randomBoolean(), new ByteBufferWrapper(ByteBuffer.allocate(0)));
+ ClientMessageImpl message1 = new ClientMessageImpl(RandomUtil.randomBoolean(), new ByteBufferWrapper(ByteBuffer.allocate(0)), 1024);
message1.setDestination(new SimpleString("test"));
PacketImpl message = new ProducerSendMessage(message1);
setHeaders(message);
@@ -486,7 +486,7 @@
public void testProducerSendMessageBodyProps2() throws Exception
{
ClientMessageImpl message1 = new ClientMessageImpl(RandomUtil.randomByte(), RandomUtil.randomBoolean(),
- RandomUtil.randomLong(), RandomUtil.randomLong(), RandomUtil.randomByte(), new ByteBufferWrapper(ByteBuffer.allocate(1024)));
+ RandomUtil.randomLong(), RandomUtil.randomLong(), RandomUtil.randomByte(), new ByteBufferWrapper(ByteBuffer.allocate(1024)), 1024);
message1.setDestination(new SimpleString("test"));
byte[] bytes = RandomUtil.randomBytes();
ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocateDirect(bytes.length));
@@ -538,7 +538,7 @@
public void testProducerSendMessageBodyProps3() throws Exception
{
- ClientMessageImpl message1 = new ClientMessageImpl(RandomUtil.randomByte(), RandomUtil.randomBoolean(), new ByteBufferWrapper(ByteBuffer.allocate(1024)));
+ ClientMessageImpl message1 = new ClientMessageImpl(RandomUtil.randomByte(), RandomUtil.randomBoolean(), new ByteBufferWrapper(ByteBuffer.allocate(1024)), 1024);
message1.setDestination(new SimpleString("test"));
byte[] bytes = RandomUtil.randomBytes();
ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocateDirect(bytes.length));
@@ -591,7 +591,7 @@
public void testProducerSendMessageBodyProps4() throws Exception
{
- ClientMessageImpl message1 = new ClientMessageImpl(RandomUtil.randomBoolean(), new ByteBufferWrapper(ByteBuffer.allocate(1024)));
+ ClientMessageImpl message1 = new ClientMessageImpl(RandomUtil.randomBoolean(), new ByteBufferWrapper(ByteBuffer.allocate(1024)), 1024);
message1.setDestination(new SimpleString("test"));
byte[] bytes = RandomUtil.randomBytes();
ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocateDirect(bytes.length));
@@ -645,7 +645,7 @@
{
ServerMessage message1 = new ServerMessageImpl();
message1.setDestination(new SimpleString("test"));
- // message1.setBody(new ByteBufferWrapper(ByteBuffer.allocate(0)));
+ // message1.setBody(new ByteBufferWrapper(ByteBuffer.allocate(0)), 1024);
PacketImpl message = new ReceiveMessage(message1, RandomUtil.randomInt(), RandomUtil.randomInt());
setHeaders(message);
//message.encode(buff);
@@ -665,7 +665,7 @@
{
ServerMessage message1 = new ServerMessageImpl(RandomUtil.randomLong());
message1.setDestination(new SimpleString("test"));
- // message1.setBody(new ByteBufferWrapper(ByteBuffer.allocate(0)));
+ // message1.setBody(new ByteBufferWrapper(ByteBuffer.allocate(0)), 1024);
PacketImpl message = new ReceiveMessage(message1, RandomUtil.randomInt(), RandomUtil.randomInt());
setHeaders(message);
//message.encode(buff);
@@ -685,7 +685,7 @@
{
ServerMessage message1 = new ServerMessageImpl(new ServerMessageImpl());
message1.setDestination(new SimpleString("test"));
- // message1.setBody(new ByteBufferWrapper(ByteBuffer.allocate(0)));
+ // message1.setBody(new ByteBufferWrapper(ByteBuffer.allocate(0)), 1024);
PacketImpl message = new ReceiveMessage(message1, RandomUtil.randomInt(), RandomUtil.randomInt());
setHeaders(message);
//message.encode(buff);
@@ -706,7 +706,7 @@
ServerMessage message1 = new ServerMessageImpl(RandomUtil.randomByte(), RandomUtil.randomBoolean(), RandomUtil.randomLong(),
RandomUtil.randomLong(), RandomUtil.randomByte(),new ByteBufferWrapper(ByteBuffer.allocateDirect(1024)));
message1.setDestination(new SimpleString("test"));
- // message1.setBody(new ByteBufferWrapper(ByteBuffer.allocate(0)));
+ // message1.setBody(new ByteBufferWrapper(ByteBuffer.allocate(0)), 1024);
PacketImpl message = new ReceiveMessage(message1, RandomUtil.randomInt(), RandomUtil.randomInt());
setHeaders(message);
//message.encode(buff);
Modified: branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java
===================================================================
--- branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -44,9 +44,9 @@
{
ClientSession session = EasyMock.createNiceMock(ClientSession.class);
ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(3000));
- ClientMessage clientMessage = new ClientMessageImpl(JBossBytesMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
+ ClientMessage clientMessage = new ClientMessageImpl(JBossBytesMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body, 3000);
ByteBufferWrapper body2 = new ByteBufferWrapper(ByteBuffer.allocate(3000));
- ClientMessage clientMessage2 = new ClientMessageImpl(JBossBytesMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body2);
+ ClientMessage clientMessage2 = new ClientMessageImpl(JBossBytesMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body2, 3000);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage2);
EasyMock.replay(session);
Modified: branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageProducerTest.java
===================================================================
--- branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageProducerTest.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageProducerTest.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -387,7 +387,7 @@
Message message = createStrictMock(Message.class);
ClientSession session = EasyMock.createNiceMock(ClientSession.class);
ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- ClientMessage clientMessage = new ClientMessageImpl(JBossMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
+ ClientMessage clientMessage = new ClientMessageImpl(JBossMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body, 1024);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
expect(clientProducer.isClosed()).andStubReturn(false);
message.setJMSDeliveryMode(anyInt());
@@ -427,7 +427,7 @@
EasyMock.expect(jbConn.getUID()).andReturn(randomSimpleString());
EasyMock.expect(jbConn.hasNoLocal()).andStubReturn(false);
ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- ClientMessage clientMessage = new ClientMessageImpl(JBossMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
+ ClientMessage clientMessage = new ClientMessageImpl(JBossMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body, 1024);
expect(clientSession.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
Message message = createStrictMock(Message.class);
expect(clientProducer.isClosed()).andStubReturn(false);
Modified: branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java
===================================================================
--- branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -110,7 +110,7 @@
Message foreignMessage = createNiceMock(Message.class);
ClientSession session = EasyMock.createNiceMock(ClientSession.class);
ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- ClientMessage clientMessage = new ClientMessageImpl(JBossMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
+ ClientMessage clientMessage = new ClientMessageImpl(JBossMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body, 1024);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
expect(foreignMessage.getJMSDeliveryMode()).andReturn(
DeliveryMode.NON_PERSISTENT);
Modified: branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossObjectMessageTest.java
===================================================================
--- branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossObjectMessageTest.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossObjectMessageTest.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -74,7 +74,7 @@
ObjectMessage foreignMessage = createNiceMock(ObjectMessage.class);
ClientSession session = EasyMock.createNiceMock(ClientSession.class);
ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- ClientMessage clientMessage = new ClientMessageImpl(JBossObjectMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
+ ClientMessage clientMessage = new ClientMessageImpl(JBossObjectMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body, 1024);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
expect(foreignMessage.getJMSDeliveryMode()).andReturn(DeliveryMode.NON_PERSISTENT);
expect(foreignMessage.getPropertyNames()).andReturn(Collections.enumeration(Collections.EMPTY_LIST));
Modified: branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossSessionTest.java
===================================================================
--- branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossSessionTest.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossSessionTest.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -2019,7 +2019,7 @@
throws JMSException
{
ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- ClientMessage clientMessage = new ClientMessageImpl(JBossMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
+ ClientMessage clientMessage = new ClientMessageImpl(JBossMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body, 1024);
expect(mockClientSession.isClosed()).andReturn(false);
expect(mockClientSession.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
replay(sf, mockClientSession);
Modified: branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossTextMessageTest.java
===================================================================
--- branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossTextMessageTest.java 2008-08-27 10:43:32 UTC (rev 4878)
+++ branches/Branch_Message_Chunking_new/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossTextMessageTest.java 2008-08-27 12:12:11 UTC (rev 4879)
@@ -70,7 +70,7 @@
TextMessage foreignMessage = createNiceMock(TextMessage.class);
ClientSession session = EasyMock.createNiceMock(ClientSession.class);
ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
- ClientMessage clientMessage = new ClientMessageImpl(JBossTextMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
+ ClientMessage clientMessage = new ClientMessageImpl(JBossTextMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body, 1024);
expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
expect(foreignMessage.getJMSDeliveryMode()).andReturn(DeliveryMode.NON_PERSISTENT);
expect(foreignMessage.getPropertyNames()).andReturn(Collections.enumeration(Collections.EMPTY_LIST));
More information about the jboss-cvs-commits
mailing list