[jboss-cvs] JBoss Messaging SVN: r8336 - in branches/JBMESSAGING_1876: integration/EAP5/etc/xmdesc and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 14 04:29:27 EDT 2011
Author: gaohoward
Date: 2011-06-14 04:29:27 -0400 (Tue, 14 Jun 2011)
New Revision: 8336
Modified:
branches/JBMESSAGING_1876/integration/EAP4/etc/xmdesc/ConnectionFactory-xmbean.xml
branches/JBMESSAGING_1876/integration/EAP5/etc/xmdesc/ConnectionFactory-xmbean.xml
branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/container/ClientConsumer.java
branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/container/ConsumerAspect.java
branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/container/StateCreationAspect.java
branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/state/ConnectionState.java
branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/state/ConsumerState.java
branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/state/SessionState.java
branches/JBMESSAGING_1876/src/main/org/jboss/jms/server/ConnectionFactoryManager.java
branches/JBMESSAGING_1876/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java
branches/JBMESSAGING_1876/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
Log:
added property to CF
Modified: branches/JBMESSAGING_1876/integration/EAP4/etc/xmdesc/ConnectionFactory-xmbean.xml
===================================================================
--- branches/JBMESSAGING_1876/integration/EAP4/etc/xmdesc/ConnectionFactory-xmbean.xml 2011-06-14 07:58:21 UTC (rev 8335)
+++ branches/JBMESSAGING_1876/integration/EAP4/etc/xmdesc/ConnectionFactory-xmbean.xml 2011-06-14 08:29:27 UTC (rev 8336)
@@ -159,6 +159,12 @@
<name>RetryChangeRateInterval</name>
<type>long</type>
</attribute>
+
+ <attribute access="read-write" getMethod="getMinTimeoutProcessTime" setMethod="setMinTimeoutProcessTime">
+ <description>Minimum processing time allowed for (milliseconds) in a timeout receive. Default is 50.</description>
+ <name>MinTimeoutProcessTime</name>
+ <type>long</type>
+ </attribute>
<!-- Managed operations -->
Modified: branches/JBMESSAGING_1876/integration/EAP5/etc/xmdesc/ConnectionFactory-xmbean.xml
===================================================================
--- branches/JBMESSAGING_1876/integration/EAP5/etc/xmdesc/ConnectionFactory-xmbean.xml 2011-06-14 07:58:21 UTC (rev 8335)
+++ branches/JBMESSAGING_1876/integration/EAP5/etc/xmdesc/ConnectionFactory-xmbean.xml 2011-06-14 08:29:27 UTC (rev 8336)
@@ -159,6 +159,12 @@
<name>RetryChangeRateInterval</name>
<type>long</type>
</attribute>
+
+ <attribute access="read-write" getMethod="getMinTimeoutProcessTime" setMethod="setMinTimeoutProcessTime">
+ <description>Minimum processing time allowed for (milliseconds) in a timeout receive. Default is 50.</description>
+ <name>MinTimeoutProcessTime</name>
+ <type>long</type>
+ </attribute>
<!-- Managed operations -->
Modified: branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/container/ClientConsumer.java
===================================================================
--- branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/container/ClientConsumer.java 2011-06-14 07:58:21 UTC (rev 8335)
+++ branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/container/ClientConsumer.java 2011-06-14 08:29:27 UTC (rev 8336)
@@ -334,7 +334,8 @@
long maxRetryChangeRate,
long retryChangeRateInterval,
boolean isClustered,
- CallbackManager cbManager)
+ CallbackManager cbManager,
+ long minTimeoutProcessTime)
{
if (bufferSize < 1)
{
@@ -362,6 +363,7 @@
consumerLock = new Object();
}
messageSource = cbManager;
+ this.minTimeoutProcessTime = minTimeoutProcessTime;
}
// Public ---------------------------------------------------------------------------------------
Modified: branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/container/ConsumerAspect.java
===================================================================
--- branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/container/ConsumerAspect.java 2011-06-14 07:58:21 UTC (rev 8335)
+++ branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/container/ConsumerAspect.java 2011-06-14 08:29:27 UTC (rev 8336)
@@ -120,7 +120,7 @@
prefetchSize, executor, maxDeliveries, consumerState.isShouldAck(),
redeliveryDelay, consumerState.getMaxRetryChangeRate(),
consumerState.getRetryChangeRateInterval(),
- fcc != null, cm);
+ fcc != null, cm, consumerState.getMinTimeoutProcessTime());
sessionState.addCallbackHandler(messageHandler);
Modified: branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/container/StateCreationAspect.java
===================================================================
--- branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/container/StateCreationAspect.java 2011-06-14 07:58:21 UTC (rev 8335)
+++ branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/container/StateCreationAspect.java 2011-06-14 08:29:27 UTC (rev 8336)
@@ -100,7 +100,8 @@
new ConnectionState(serverID, connectionDelegate,
remotingConnection, versionToUse,
connectionDelegate.isEnableOrderingGroup(), connectionDelegate.getDefaultOrderingGroupName(),
- connectionDelegate.getMaxRetryChangeRate(), connectionDelegate.getRetryChangeRateInterval());
+ connectionDelegate.getMaxRetryChangeRate(), connectionDelegate.getRetryChangeRateInterval(),
+ connectionDelegate.getMinTimeoutProcessTime());
remotingConnection.getConnectionListener().setConnectionState(connectionState);
remotingConnection.getConnectionListener().start();
Modified: branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
===================================================================
--- branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java 2011-06-14 07:58:21 UTC (rev 8335)
+++ branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java 2011-06-14 08:29:27 UTC (rev 8336)
@@ -90,6 +90,8 @@
private long maxRetryChangeRate;
private long retryChangeRateInterval;
+
+ private long minTimeoutProcessTime;
// Static ---------------------------------------------------------------------------------------
@@ -396,6 +398,16 @@
{
this.retryChangeRateInterval = retryChangeRateInterval;
}
+
+ public long getMinTimeoutProcessTime()
+ {
+ return minTimeoutProcessTime;
+ }
+
+ public void setMinTimeoutProcessTime(long minTimeoutProcessTime)
+ {
+ this.minTimeoutProcessTime = minTimeoutProcessTime;
+ }
// Package Private ------------------------------------------------------------------------------
Modified: branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
===================================================================
--- branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java 2011-06-14 07:58:21 UTC (rev 8335)
+++ branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java 2011-06-14 08:29:27 UTC (rev 8336)
@@ -88,6 +88,8 @@
private long retryChangeRateInterval;
+ private long minTimeoutProcessTime;
+
// Static ---------------------------------------------------------------------------------------
/*
@@ -119,7 +121,7 @@
public ClientConnectionFactoryDelegate(String uniqueName, String objectID, int serverID, String serverLocatorURI,
Version serverVersion, boolean clientPing, boolean strictTck,
boolean sendAcksAsync, boolean enableOrderingGroup, String defaultOrderingGroupName,
- long maxRetryChangeRate, long retryChangeRateInterval)
+ long maxRetryChangeRate, long retryChangeRateInterval, long minTimeoutProcessTime)
{
super(objectID);
@@ -134,6 +136,7 @@
this.setDefaultOrderingGroupName(defaultOrderingGroupName);
this.maxRetryChangeRate = maxRetryChangeRate;
this.retryChangeRateInterval = retryChangeRateInterval;
+ this.minTimeoutProcessTime = minTimeoutProcessTime;
}
public ClientConnectionFactoryDelegate()
@@ -220,6 +223,8 @@
connectionDelegate.setMaxRetryChangeRate(this.maxRetryChangeRate);
connectionDelegate.setRetryChangeRateInterval(this.retryChangeRateInterval);
+
+ connectionDelegate.setMinTimeoutProcessTime(this.minTimeoutProcessTime);
}
else
{
@@ -387,6 +392,8 @@
maxRetryChangeRate = in.readLong();
retryChangeRateInterval = in.readLong();
+
+ minTimeoutProcessTime = in.readLong();
}
public void write(DataOutputStream out) throws Exception
@@ -408,6 +415,8 @@
out.writeLong(this.maxRetryChangeRate);
out.writeLong(this.retryChangeRateInterval);
+
+ out.writeLong(this.minTimeoutProcessTime);
}
/**
Modified: branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/state/ConnectionState.java
===================================================================
--- branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/state/ConnectionState.java 2011-06-14 07:58:21 UTC (rev 8335)
+++ branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/state/ConnectionState.java 2011-06-14 08:29:27 UTC (rev 8336)
@@ -96,13 +96,15 @@
private long maxRetryChangeRate;
private long retryChangeRateInterval;
+
+ private long minTimeoutProcessTime;
// Constructors ---------------------------------------------------------------------------------
public ConnectionState(int serverID, ConnectionDelegate delegate,
JMSRemotingConnection remotingConnection,
Version versionToUse, boolean enableOrderingGroup, String defaultOrderingGroupName,
- long maxRetryChangeRate, long retryChangeRateInterval)
+ long maxRetryChangeRate, long retryChangeRateInterval, long minTimeoutProcessTime)
throws Exception
{
super(null, (DelegateSupport)delegate);
@@ -128,6 +130,8 @@
this.maxRetryChangeRate = maxRetryChangeRate;
this.retryChangeRateInterval = retryChangeRateInterval;
+
+ this.minTimeoutProcessTime = minTimeoutProcessTime;
}
// HierarchicalState implementation -------------------------------------------------------------
@@ -338,6 +342,11 @@
}
+ public long getMinTimeoutProcessTime()
+ {
+ return minTimeoutProcessTime;
+ }
+
// Package protected ----------------------------------------------------------------------------
// Protected ------------------------------------------------------------------------------------
Modified: branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/state/ConsumerState.java
===================================================================
--- branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/state/ConsumerState.java 2011-06-14 07:58:21 UTC (rev 8335)
+++ branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/state/ConsumerState.java 2011-06-14 08:29:27 UTC (rev 8336)
@@ -69,6 +69,8 @@
private long maxRetryChangeRate;
private long retryChangeRateInterval;
+ private long minTimeoutProcessTime;
+
// Constructors ---------------------------------------------------------------------------------
public ConsumerState(SessionState parent, ConsumerDelegate delegate, JBossDestination dest,
@@ -88,6 +90,7 @@
this.redeliveryDelay = redeliveryDelay;
this.maxRetryChangeRate = parent.getMaxRetryChangeRate();
this.retryChangeRateInterval = parent.getRetryChangeRateInterval();
+ this.minTimeoutProcessTime = parent.getMinTimeoutProcessTime();
//We don't store deliveries if this a non durable subscriber
@@ -241,6 +244,11 @@
clientConsumer.abortReceive();
}
+ public long getMinTimeoutProcessTime()
+ {
+ return this.minTimeoutProcessTime;
+ }
+
// Package protected ----------------------------------------------------------------------------
// Protected ------------------------------------------------------------------------------------
Modified: branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/state/SessionState.java
===================================================================
--- branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/state/SessionState.java 2011-06-14 07:58:21 UTC (rev 8335)
+++ branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/state/SessionState.java 2011-06-14 08:29:27 UTC (rev 8336)
@@ -646,5 +646,10 @@
}
}
+ public long getMinTimeoutProcessTime()
+ {
+ return parent.getMinTimeoutProcessTime();
+ }
+
}
Modified: branches/JBMESSAGING_1876/src/main/org/jboss/jms/server/ConnectionFactoryManager.java
===================================================================
--- branches/JBMESSAGING_1876/src/main/org/jboss/jms/server/ConnectionFactoryManager.java 2011-06-14 07:58:21 UTC (rev 8335)
+++ branches/JBMESSAGING_1876/src/main/org/jboss/jms/server/ConnectionFactoryManager.java 2011-06-14 08:29:27 UTC (rev 8336)
@@ -55,7 +55,8 @@
boolean enableOrderingGroup,
String defaultOrderingGroupName,
long maxRetryChangeRate,
- long retryChangeRateInterval) throws Exception;
+ long retryChangeRateInterval,
+ long minTimeoutProcessTime) throws Exception;
void unregisterConnectionFactory(String uniqueName, boolean supportsFailover, boolean supportsLoadBalancing) throws Exception;
}
Modified: branches/JBMESSAGING_1876/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java
===================================================================
--- branches/JBMESSAGING_1876/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java 2011-06-14 07:58:21 UTC (rev 8335)
+++ branches/JBMESSAGING_1876/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java 2011-06-14 08:29:27 UTC (rev 8336)
@@ -92,6 +92,8 @@
private long maxRetryChangeRate = 0;
private long retryChangeRateInterval = 5000;
+
+ private long minTimeoutProcessTime = 50;
// Constructors ---------------------------------------------------------------------------------
@@ -213,7 +215,7 @@
defaultTempQueueFullSize, defaultTempQueuePageSize,
defaultTempQueueDownCacheSize, dupsOKBatchSize, supportsFailover, supportsLoadBalancing,
loadBalancingFactory, strictTck, sendAcksAsync, enableOrderingGroup, defaultOrderingGroupName,
- maxRetryChangeRate, retryChangeRateInterval);
+ maxRetryChangeRate, retryChangeRateInterval, minTimeoutProcessTime);
String info = "Connector " + locator.getProtocol() + "://" +
locator.getHost() + ":" + locator.getPort();
Modified: branches/JBMESSAGING_1876/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
===================================================================
--- branches/JBMESSAGING_1876/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2011-06-14 07:58:21 UTC (rev 8335)
+++ branches/JBMESSAGING_1876/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2011-06-14 08:29:27 UTC (rev 8336)
@@ -133,7 +133,8 @@
boolean enableOrderingGroup,
String defaultOrderingGroupName,
long maxRetryChangeRate,
- long retryChangeRateInterval)
+ long retryChangeRateInterval,
+ long minTimeoutProcessTime)
throws Exception
{
log.debug(this + " registering connection factory '" + uniqueName + "', bindings: " + jndiBindings);
@@ -189,7 +190,7 @@
new ClientConnectionFactoryDelegate(uniqueName, id, serverPeer.getServerPeerID(),
locatorURI, version, clientPing, useStrict,
sendAcksAsync, enableOrderingGroup, defaultOrderingGroupName,
- maxRetryChangeRate, retryChangeRateInterval);
+ maxRetryChangeRate, retryChangeRateInterval, minTimeoutProcessTime);
log.debug(this + " created local delegate " + localDelegate);
More information about the jboss-cvs-commits
mailing list