[jboss-cvs] JBoss Messaging SVN: r5192 - in branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging: core/client/impl and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 28 12:33:42 EDT 2008
Author: clebert.suconic at jboss.com
Date: 2008-10-28 12:33:41 -0400 (Tue, 28 Oct 2008)
New Revision: 5192
Modified:
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/client/ClientSessionFactory.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateSessionMessage.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/MessagingServer.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/ServerSession.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/JMSServerManager.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/management/JMSServerControlMBean.java
branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/management/impl/JMSServerControl.java
Log:
Intermediate tweak before a change I am going to do on FlowControl
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/client/ClientSessionFactory.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/client/ClientSessionFactory.java 2008-10-28 07:55:48 UTC (rev 5191)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/client/ClientSessionFactory.java 2008-10-28 16:33:41 UTC (rev 5192)
@@ -61,9 +61,9 @@
int getProducerMaxRate();
- int getBigMessageSize();
+ int getminLargeMessageSize();
- void setBigMessageSize(final int bigMessageSize);
+ void setminLargeMessageSize(final int minLargeMessageSize);
boolean isBlockOnPersistentSend();
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java 2008-10-28 07:55:48 UTC (rev 5191)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java 2008-10-28 16:33:41 UTC (rev 5192)
@@ -86,7 +86,7 @@
private final SimpleString autoGroupId;
- private final int bigMessageSize;
+ private final int minLargeMessageSize;
// Static ---------------------------------------------------------------------------------------
@@ -100,7 +100,7 @@
final boolean blockOnPersistentSend,
final SimpleString autoGroupId,
final int initialCredits,
- final int bigMessageSize,
+ final int minLargeMessageSize,
final Channel channel)
{
this.channel = channel;
@@ -119,7 +119,7 @@
this.autoGroupId = autoGroupId;
- this.bigMessageSize = bigMessageSize;
+ this.minLargeMessageSize = minLargeMessageSize;
availableCredits = new Semaphore(initialCredits);
@@ -330,7 +330,7 @@
boolean sendBlocking = msg.isDurable() ? blockOnPersistentSend : blockOnNonPersistentSend;
- if (msg.getEncodeSize() > bigMessageSize)
+ if (msg.getEncodeSize() > minLargeMessageSize)
{
// TODO: We need to send message-chunks blocked until producer flow control is done.
// When sending really big messages, you could overuse the communication channel up to the point
@@ -384,7 +384,7 @@
{
int headerSize = msg.getPropertiesEncodeSize();
- if (headerSize > bigMessageSize)
+ if (headerSize > minLargeMessageSize)
{
throw new MessagingException(MessagingException.ILLEGAL_STATE,
"Header size is too big, use the messageBody for large data");
@@ -395,7 +395,7 @@
final int bodySize = msg.getBodySize();
- int bodyLength = bigMessageSize - headerSize;
+ int bodyLength = minLargeMessageSize - headerSize;
MessagingBuffer bodyBuffer = new ByteBufferWrapper(ByteBuffer.allocate(bodyLength));
@@ -419,7 +419,7 @@
for (int pos = bodyLength; pos < bodySize;)
{
- bodyLength = Math.min(bodySize - pos, bigMessageSize);
+ bodyLength = Math.min(bodySize - pos, minLargeMessageSize);
bodyBuffer = new ByteBufferWrapper(ByteBuffer.allocate(bodyLength));
msg.encodeBody(bodyBuffer, pos, bodyLength);
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java 2008-10-28 07:55:48 UTC (rev 5191)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java 2008-10-28 16:33:41 UTC (rev 5192)
@@ -90,7 +90,7 @@
private volatile long callTimeout;
- private volatile int bigMessageSize;
+ private volatile int minLargeMessageSize;
private volatile int consumerWindowSize;
@@ -129,7 +129,7 @@
final int consumerMaxRate,
final int producerWindowSize,
final int producerMaxRate,
- final int bigMessageSize,
+ final int minLargeMessageSize,
final boolean blockOnAcknowledge,
final boolean blockOnNonPersistentSend,
final boolean blockOnPersistentSend,
@@ -151,7 +151,7 @@
this.blockOnAcknowledge = blockOnAcknowledge;
this.blockOnNonPersistentSend = blockOnNonPersistentSend;
this.blockOnPersistentSend = blockOnPersistentSend;
- this.bigMessageSize = bigMessageSize;
+ this.minLargeMessageSize = minLargeMessageSize;
this.autoGroupId = autoGroupId;
connectionRegistry = ConnectionRegistryImpl.instance;
}
@@ -175,7 +175,7 @@
blockOnAcknowledge = DEFAULT_BLOCK_ON_ACKNOWLEDGE;
blockOnPersistentSend = DEFAULT_BLOCK_ON_PERSISTENT_SEND;
blockOnNonPersistentSend = DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND;
- bigMessageSize = DEFAULT_BIG_MESSAGE_SIZE;
+ minLargeMessageSize = DEFAULT_BIG_MESSAGE_SIZE;
autoGroupId = DEFAULT_AUTO_GROUP_ID;
connectionRegistry = ConnectionRegistryImpl.instance;
}
@@ -196,7 +196,7 @@
blockOnAcknowledge = DEFAULT_BLOCK_ON_ACKNOWLEDGE;
blockOnPersistentSend = DEFAULT_BLOCK_ON_PERSISTENT_SEND;
blockOnNonPersistentSend = DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND;
- bigMessageSize = DEFAULT_BIG_MESSAGE_SIZE;
+ minLargeMessageSize = DEFAULT_BIG_MESSAGE_SIZE;
autoGroupId = DEFAULT_AUTO_GROUP_ID;
connectionRegistry = ConnectionRegistryImpl.instance;
}
@@ -398,19 +398,19 @@
}
/**
- * @return the bigMessageSize
+ * @return the minLargeMessageSize
*/
- public int getBigMessageSize()
+ public int getminLargeMessageSize()
{
- return bigMessageSize;
+ return minLargeMessageSize;
}
/**
- * @param bigMessageSize the bigMessageSize to set
+ * @param minLargeMessageSize the minLargeMessageSize to set
*/
- public void setBigMessageSize(int bigMessageSize)
+ public void setminLargeMessageSize(int minLargeMessageSize)
{
- this.bigMessageSize = bigMessageSize;
+ this.minLargeMessageSize = minLargeMessageSize;
}
// ClientSessionFactoryInternal implementation
@@ -519,7 +519,7 @@
clientVersion.getIncrementingVersion(),
username,
password,
- bigMessageSize,
+ minLargeMessageSize,
xa,
autoCommitSends,
autoCommitAcks);
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java 2008-10-28 07:55:48 UTC (rev 5191)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java 2008-10-28 16:33:41 UTC (rev 5192)
@@ -451,7 +451,7 @@
autoCommitSends && blockOnPersistentSend,
response.getAutoGroupId(),
response.getInitialCredits(),
- sessionFactory.getBigMessageSize(),
+ sessionFactory.getminLargeMessageSize(),
channel);
}
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateSessionMessage.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateSessionMessage.java 2008-10-28 07:55:48 UTC (rev 5191)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateSessionMessage.java 2008-10-28 16:33:41 UTC (rev 5192)
@@ -46,7 +46,7 @@
private String password;
- private int bigMessageSize;
+ private int minLargeMessageSize;
private boolean xa;
@@ -60,7 +60,7 @@
public CreateSessionMessage(final String name, final long sessionChannelID,
final int version, final String username, final String password,
- final int bigMessageSize,
+ final int minLargeMessageSize,
final boolean xa, final boolean autoCommitSends,
final boolean autoCommitAcks)
{
@@ -76,7 +76,7 @@
this.password = password;
- this.bigMessageSize = bigMessageSize;
+ this.minLargeMessageSize = minLargeMessageSize;
this.xa = xa;
@@ -139,7 +139,7 @@
buffer.putInt(version);
buffer.putNullableString(username);
buffer.putNullableString(password);
- buffer.putInt(bigMessageSize);
+ buffer.putInt(minLargeMessageSize);
buffer.putBoolean(xa);
buffer.putBoolean(autoCommitSends);
buffer.putBoolean(autoCommitAcks);
@@ -152,7 +152,7 @@
version = buffer.getInt();
username = buffer.getNullableString();
password = buffer.getNullableString();
- bigMessageSize = buffer.getInt();
+ minLargeMessageSize = buffer.getInt();
xa = buffer.getBoolean();
autoCommitSends = buffer.getBoolean();
autoCommitAcks = buffer.getBoolean();
@@ -188,9 +188,9 @@
/**
* @return
*/
- public int getBigMessageSize()
+ public int getminLargeMessageSize()
{
- return bigMessageSize;
+ return minLargeMessageSize;
}
// Package protected ---------------------------------------------
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/MessagingServer.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/MessagingServer.java 2008-10-28 07:55:48 UTC (rev 5191)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/MessagingServer.java 2008-10-28 16:33:41 UTC (rev 5192)
@@ -69,7 +69,7 @@
String password,
int incrementingVersion,
RemotingConnection remotingConnection,
- int bigMessageSize,
+ int minLargeMessageSize,
boolean autoCommitSends,
boolean autoCommitAcks,
boolean xa) throws Exception;
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/ServerSession.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/ServerSession.java 2008-10-28 07:55:48 UTC (rev 5191)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/ServerSession.java 2008-10-28 16:33:41 UTC (rev 5192)
@@ -68,7 +68,7 @@
String getPassword();
- int getBigMessageSize();
+ int getMinLargeMessageSize();
void removeConsumer(ServerConsumer consumer) throws Exception;
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-10-28 07:55:48 UTC (rev 5191)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-10-28 16:33:41 UTC (rev 5192)
@@ -432,7 +432,7 @@
final String password,
final int incrementingVersion,
final RemotingConnection connection,
- final int bigMessageSize,
+ final int minLargeMessageSize,
final boolean autoCommitSends,
final boolean autoCommitAcks,
final boolean xa) throws Exception
@@ -464,7 +464,7 @@
channelID,
username,
password,
- bigMessageSize,
+ minLargeMessageSize,
autoCommitSends,
autoCommitAcks,
xa,
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java 2008-10-28 07:55:48 UTC (rev 5191)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java 2008-10-28 16:33:41 UTC (rev 5192)
@@ -79,7 +79,7 @@
request.getPassword(),
request.getVersion(),
connection,
- request.getBigMessageSize(),
+ request.getminLargeMessageSize(),
request.isAutoCommitSends(),
request.isAutoCommitAcks(),
request.isXA());
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java 2008-10-28 07:55:48 UTC (rev 5191)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java 2008-10-28 16:33:41 UTC (rev 5192)
@@ -85,7 +85,7 @@
private final Filter filter;
- private final int bigMessageSize;
+ private final int minLargeMessageSize;
private final ServerSession session;
@@ -157,7 +157,7 @@
messageQueue.addConsumer(this);
- this.bigMessageSize = session.getBigMessageSize();
+ this.minLargeMessageSize = session.getMinLargeMessageSize();
}
// ServerConsumer implementation
@@ -215,30 +215,30 @@
if (message instanceof ServerLargeMessage)
{
- if (result == null)
- {
+// if (result == null)
+// {
// Not replicated - just send now
sendChunks((ServerLargeMessage)message);
- }
- else
- {
- // Send when replicate delivery response comes back
- result.setResultRunner(new Runnable()
- {
- public void run()
- {
- try
- {
- sendChunks((ServerLargeMessage)message);
- }
- catch (Exception e)
- {
- log.error(e);
- }
- }
- });
-
- }
+// }
+// else
+// {
+// // Send when replicate delivery response comes back
+// result.setResultRunner(new Runnable()
+// {
+// public void run()
+// {
+// try
+// {
+// sendChunks((ServerLargeMessage)message);
+// }
+// catch (Exception e)
+// {
+// log.error(e);
+// }
+// }
+// });
+//
+// }
}
else
{
@@ -467,48 +467,50 @@
*/
private void sendChunks(ServerLargeMessage message) throws Exception
{
- int headerSize = message.getPropertiesEncodeSize();
-
final int bodySize = message.getBodySize();
- int bodyLength = bigMessageSize - headerSize;
-
- MessagingBuffer headerBuffer = new ByteBufferWrapper(ByteBuffer.allocate(message.getPropertiesEncodeSize()));
- message.encodeProperties(headerBuffer);
+ int chunkLength = 0;
- MessagingBuffer bodyBuffer = new ByteBufferWrapper(ByteBuffer.allocate(bodyLength));
- message.encodeBody(bodyBuffer, 0, bodyLength);
-
- SessionSendChunkMessage chunk = new SessionSendChunkMessage(id,
- headerBuffer.array(),
- bodyBuffer.array(),
- bodyLength < bodySize,
- false);
+ SessionSendChunkMessage chunk = null;
- if (availableCredits != null)
+ for (int pos = 0; pos < bodySize; pos += chunkLength)
{
- availableCredits.acquire(chunk.getPacketSize());
- }
-
- channel.send(chunk);
+
+ if (pos == 0)
+ {
+ int headerSize = message.getPropertiesEncodeSize();
- for (int pos = bodyLength; pos < bodySize;)
- {
- bodyLength = Math.min(bodySize - pos, bigMessageSize);
- bodyBuffer = new ByteBufferWrapper(ByteBuffer.allocate(bodyLength));
+ chunkLength = minLargeMessageSize - headerSize;
- message.encodeBody(bodyBuffer, pos, bodyLength);
+ MessagingBuffer headerBuffer = new ByteBufferWrapper(ByteBuffer.allocate(message.getPropertiesEncodeSize()));
+ message.encodeProperties(headerBuffer);
+
+ MessagingBuffer bodyBuffer = new ByteBufferWrapper(ByteBuffer.allocate(chunkLength));
+ message.encodeBody(bodyBuffer, 0, chunkLength);
- chunk = new SessionSendChunkMessage(id, null, bodyBuffer.array(), pos + bodyLength < bodySize, false);
+ chunk = new SessionSendChunkMessage(id,
+ headerBuffer.array(),
+ bodyBuffer.array(),
+ chunkLength < bodySize,
+ false);
+ }
+ else
+ {
+ chunkLength = Math.min(bodySize - pos, minLargeMessageSize);
+ MessagingBuffer bodyBuffer = new ByteBufferWrapper(ByteBuffer.allocate(chunkLength));
+ message.encodeBody(bodyBuffer, pos, chunkLength);
+
+
+ chunk = new SessionSendChunkMessage(id, null, bodyBuffer.array(), pos + chunkLength < bodySize, false);
+ }
+
if (availableCredits != null)
{
availableCredits.acquire(chunk.getPacketSize());
}
channel.send(chunk);
-
- pos += bodyLength;
}
message.releaseResources();
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2008-10-28 07:55:48 UTC (rev 5191)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2008-10-28 16:33:41 UTC (rev 5192)
@@ -128,7 +128,7 @@
private final String password;
- private final int bigMessageSize;
+ private final int minLargeMessageSize;
private final boolean autoCommitSends;
@@ -178,7 +178,7 @@
final long id,
final String username,
final String password,
- final int bigMessageSize,
+ final int minLargeMessageSize,
final boolean autoCommitSends,
final boolean autoCommitAcks,
final boolean xa,
@@ -200,7 +200,7 @@
this.password = password;
- this.bigMessageSize = bigMessageSize;
+ this.minLargeMessageSize = minLargeMessageSize;
this.autoCommitSends = autoCommitSends;
@@ -250,9 +250,9 @@
return password;
}
- public int getBigMessageSize()
+ public int getMinLargeMessageSize()
{
- return bigMessageSize;
+ return minLargeMessageSize;
}
public long getID()
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java 2008-10-28 07:55:48 UTC (rev 5191)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java 2008-10-28 16:33:41 UTC (rev 5192)
@@ -69,7 +69,7 @@
private final int producerMaxRate;
- private final int bigMessageSize;
+ private final int minLargeMessageSize;
private final boolean blockOnAcknowledge;
@@ -91,7 +91,7 @@
final int consumerMaxRate,
final int producerWindowSize,
final int producerMaxRate,
- final int bigMessageSize,
+ final int minLargeMessageSize,
final boolean blockOnAcknowledge,
final boolean blockOnNonPersistentSend,
final boolean blockOnPersistentSend,
@@ -108,7 +108,7 @@
this.producerMaxRate = producerMaxRate;
this.producerWindowSize = producerWindowSize;
this.blockOnAcknowledge = blockOnAcknowledge;
- this.bigMessageSize = bigMessageSize;
+ this.minLargeMessageSize = minLargeMessageSize;
this.blockOnNonPersistentSend = blockOnNonPersistentSend;
this.blockOnPersistentSend = blockOnPersistentSend;
this.autoGroupId = autoGroupId;
@@ -283,7 +283,7 @@
consumerMaxRate,
producerWindowSize,
producerMaxRate,
- bigMessageSize,
+ minLargeMessageSize,
blockOnAcknowledge,
blockOnNonPersistentSend,
blockOnPersistentSend,
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/JMSServerManager.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/JMSServerManager.java 2008-10-28 07:55:48 UTC (rev 5191)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/JMSServerManager.java 2008-10-28 16:33:41 UTC (rev 5192)
@@ -110,7 +110,7 @@
long pingPeriod, long callTimeout, String clientID,
int dupsOKBatchSize, int consumerWindowSize, int consumerMaxRate,
int producerWindowSize, int producerMaxRate,
- int bigMessageSize,
+ int minLargeMessageSize,
boolean blockOnAcknowledge,
boolean blockOnNonPersistentSend,
boolean blockOnPersistentSend, boolean autoGroupId, String jndiBinding)
@@ -122,7 +122,7 @@
long pingPeriod, long callTimeout, String clientID,
int dupsOKBatchSize, int consumerWindowSize, int consumerMaxRate,
int producerWindowSize, int producerMaxRate,
- int bigMessageSize,
+ int minLargeMessageSize,
boolean blockOnAcknowledge,
boolean blockOnNonPersistentSend,
boolean blockOnPersistentSend, boolean autoGroupId, List<String> jndiBinding)
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2008-10-28 07:55:48 UTC (rev 5191)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2008-10-28 16:33:41 UTC (rev 5192)
@@ -137,7 +137,7 @@
int consumerMaxRate = ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE;
int producerWindowSize = ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
int producerMaxRate = ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
- int bigMessageSize = ClientSessionFactoryImpl.DEFAULT_BIG_MESSAGE_SIZE;
+ int minLargeMessageSize = ClientSessionFactoryImpl.DEFAULT_BIG_MESSAGE_SIZE;
boolean blockOnAcknowledge = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE;
boolean blockOnNonPersistentSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND;
boolean blockOnPersistentSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND;
@@ -176,7 +176,7 @@
}
else if (BIG_MESSAGE_ELEMENT.equalsIgnoreCase(children.item(j).getNodeName()))
{
- bigMessageSize = Integer.parseInt(children.item(j).getTextContent().trim());
+ minLargeMessageSize = Integer.parseInt(children.item(j).getTextContent().trim());
}
else if (CLIENTID_ELEMENT.equalsIgnoreCase(children.item(j).getNodeName()))
{
@@ -402,7 +402,7 @@
consumerMaxRate,
producerWindowSize,
producerMaxRate,
- bigMessageSize,
+ minLargeMessageSize,
blockOnAcknowledge,
blockOnNonPersistentSend,
blockOnPersistentSend,
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2008-10-28 07:55:48 UTC (rev 5191)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2008-10-28 16:33:41 UTC (rev 5192)
@@ -197,7 +197,7 @@
int consumerMaxRate,
int producerWindowSize,
int producerMaxRate,
- int bigMessageSize,
+ int minLargeMessageSize,
boolean blockOnAcknowledge,
boolean blockOnNonPersistentSend,
boolean blockOnPersistentSend,
@@ -218,7 +218,7 @@
consumerMaxRate,
producerWindowSize,
producerMaxRate,
- bigMessageSize,
+ minLargeMessageSize,
blockOnAcknowledge,
blockOnNonPersistentSend,
blockOnPersistentSend,
@@ -237,7 +237,7 @@
int consumerMaxRate,
int producerWindowSize,
int producerMaxRate,
- int bigMessageSize,
+ int minLargeMessageSize,
boolean blockOnAcknowledge,
boolean blockOnNonPersistentSend,
boolean blockOnPersistentSend,
@@ -257,7 +257,7 @@
consumerMaxRate,
producerWindowSize,
producerMaxRate,
- bigMessageSize == -1 ? ClientSessionFactoryImpl.DEFAULT_BIG_MESSAGE_SIZE : bigMessageSize,
+ minLargeMessageSize == -1 ? ClientSessionFactoryImpl.DEFAULT_BIG_MESSAGE_SIZE : minLargeMessageSize,
blockOnAcknowledge,
blockOnNonPersistentSend,
blockOnPersistentSend,
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/management/JMSServerControlMBean.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/management/JMSServerControlMBean.java 2008-10-28 07:55:48 UTC (rev 5191)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/management/JMSServerControlMBean.java 2008-10-28 16:33:41 UTC (rev 5192)
@@ -79,7 +79,7 @@
@Parameter(name = "consumerMaxRate", desc = "Consumer's max rate") int consumerMaxRate,
@Parameter(name = "producerWindowSize", desc = "Producer's window size") int producerWindowSize,
@Parameter(name = "producerMaxRate", desc = "Producer's max rate") int producerMaxRate,
- @Parameter(name = "bigMessageSize", desc = "Size of what is considered a big message requiring sending in chunks") int bigMessageSize,
+ @Parameter(name = "minLargeMessageSize", desc = "Size of what is considered a big message requiring sending in chunks") int minLargeMessageSize,
@Parameter(name = "blockOnAcknowledge", desc = "Does acknowlegment block?") boolean blockOnAcknowledge,
@Parameter(name = "blockOnNonPersistentSend", desc = "Does sending non persistent messages block?") boolean blockOnNonPersistentSend,
@Parameter(name = "blockOnPersistentSend", desc = "Does sending persistent messages block") boolean blockOnPersistentSend,
Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/management/impl/JMSServerControl.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/management/impl/JMSServerControl.java 2008-10-28 07:55:48 UTC (rev 5191)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/server/management/impl/JMSServerControl.java 2008-10-28 16:33:41 UTC (rev 5192)
@@ -71,7 +71,7 @@
long pingPeriod, long callTimeout, String clientID,
int dupsOKBatchSize, int consumerWindowSize, int consumerMaxRate,
int producerWindowSize, int producerMaxRate,
- int bigMessageSize,
+ int minLargeMessageSize,
boolean blockOnAcknowledge,
boolean blockOnNonPersistentSend,
boolean blockOnPersistentSend, boolean autoGroupId, String jndiBinding) throws Exception
@@ -83,7 +83,7 @@
backupConnectorConfig,
pingPeriod, callTimeout, clientID, dupsOKBatchSize,
consumerWindowSize, consumerMaxRate, producerWindowSize, producerMaxRate,
- bigMessageSize,
+ minLargeMessageSize,
blockOnAcknowledge, blockOnNonPersistentSend,
blockOnPersistentSend, autoGroupId, jndiBinding);
if (created)
More information about the jboss-cvs-commits
mailing list