[jboss-cvs] JBoss Messaging SVN: r8248 - in branches/Branch_JBossMessaging_1_4_0_SP3_CP09_JBMESSAGING-1805_JBMESSAGING-1851: src/main/org/jboss/jms/client/delegate and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 1 13:48:37 EDT 2011
Author: jbertram
Date: 2011-04-01 13:48:37 -0400 (Fri, 01 Apr 2011)
New Revision: 8248
Modified:
branches/Branch_JBossMessaging_1_4_0_SP3_CP09_JBMESSAGING-1805_JBMESSAGING-1851/
branches/Branch_JBossMessaging_1_4_0_SP3_CP09_JBMESSAGING-1805_JBMESSAGING-1851/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
branches/Branch_JBossMessaging_1_4_0_SP3_CP09_JBMESSAGING-1805_JBMESSAGING-1851/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java
Log:
JBPAPP-5935
Property changes on: branches/Branch_JBossMessaging_1_4_0_SP3_CP09_JBMESSAGING-1805_JBMESSAGING-1851
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/Branch_1_4:8013,8238
+ /branches/Branch_1_4:8013,8238,8245
Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP09_JBMESSAGING-1805_JBMESSAGING-1851/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP09_JBMESSAGING-1805_JBMESSAGING-1851/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java 2011-04-01 09:38:30 UTC (rev 8247)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP09_JBMESSAGING-1805_JBMESSAGING-1851/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java 2011-04-01 17:48:37 UTC (rev 8248)
@@ -371,6 +371,10 @@
strictTck = in.readBoolean();
sendAcksAsync = in.readBoolean();
+
+ maxRetryChangeRate = in.readLong();
+
+ retryChangeRateInterval = in.readLong();
}
public void write(DataOutputStream out) throws Exception
@@ -388,6 +392,10 @@
out.writeBoolean(strictTck);
out.writeBoolean(sendAcksAsync);
+
+ out.writeLong(this.maxRetryChangeRate);
+
+ out.writeLong(this.retryChangeRateInterval);
}
/**
Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP09_JBMESSAGING-1805_JBMESSAGING-1851/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP09_JBMESSAGING-1805_JBMESSAGING-1851/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java 2011-04-01 09:38:30 UTC (rev 8247)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP09_JBMESSAGING-1805_JBMESSAGING-1851/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java 2011-04-01 17:48:37 UTC (rev 8248)
@@ -23,10 +23,15 @@
package org.jboss.test.messaging.jms.clustering;
import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.management.ObjectName;
+import org.jboss.jms.client.JBossConnection;
import org.jboss.jms.client.JBossConnectionFactory;
import org.jboss.jms.client.delegate.ClientClusteredConnectionFactoryDelegate;
+import org.jboss.jms.client.delegate.ClientConnectionDelegate;
import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate;
+import org.jboss.jms.client.state.ConnectionState;
import org.jboss.jms.exception.MessagingNetworkFailureException;
import org.jboss.test.messaging.tools.ServerManagement;
import org.jboss.test.messaging.tools.aop.PoisonInterceptor;
@@ -217,6 +222,181 @@
}
+ //https://issues.jboss.org/browse/JBMESSAGING-1851
+ public void testChangeRateConfigSettings() throws Exception
+ {
+ Connection c = null;
+
+ try
+ {
+ String mbeanConfig = "<mbean code=\"org.jboss.jms.server.connectionfactory.ConnectionFactory\"\n" + " name=\"jboss.messaging.connectionfactory:service=TestChangeRateConfigSettingsFactory\"\n"
+ + " xmbean-dd=\"xmdesc/ConnectionFactory-xmbean.xml\">\n"
+ + " <depends optional-attribute-name=\"ServerPeer\">jboss.messaging:service=ServerPeer</depends>\n"
+ + " <depends optional-attribute-name=\"Connector\">jboss.messaging:service=Connector,transport=bisocket</depends>\n"
+ + " <attribute name=\"JNDIBindings\">\n"
+ + " <bindings>\n"
+ + " <binding>/ClusteredTestChangeRateConfigSettingsFactory</binding>\n"
+ + " </bindings>\n"
+ + " </attribute>\n"
+ + " <attribute name=\"SupportsFailover\">true</attribute>"
+ + " <attribute name=\"SupportsLoadBalancing\">true</attribute>"
+ + " <attribute name=\"MaxRetryChangeRate\">10</attribute>\n"
+ + " <attribute name=\"RetryChangeRateInterval\">2345</attribute>\n"
+ + " </mbean>";
+
+ ObjectName on = ServerManagement.deploy(mbeanConfig);
+ ServerManagement.invoke(on, "create", new Object[0], new String[0]);
+ ServerManagement.invoke(on, "start", new Object[0], new String[0]);
+
+ ConnectionFactory cf = (ConnectionFactory)ic[0].lookup("/ClusteredTestChangeRateConfigSettingsFactory");
+ c = cf.createConnection();
+
+ ClientConnectionDelegate del1 = (ClientConnectionDelegate)((JBossConnection)c).getDelegate();
+
+ ConnectionState state1 = (ConnectionState)del1.getState();
+
+ long maxRetry = state1.getMaxRetryChangeRate();
+
+ assertEquals(10, maxRetry);
+
+ long retryInterval = state1.getRetryChangeRateInterval();
+
+ assertEquals(2345, retryInterval);
+ }
+ finally
+ {
+ try
+ {
+ if (c != null)
+ {
+ log.info("Closing connection");
+ c.close();
+ log.info("Closed connection");
+ }
+ }
+ catch (Exception e)
+ {
+ log.warn(e.toString(), e);
+ }
+ }
+ }
+
+ //https://issues.jboss.org/browse/JBMESSAGING-1851
+ public void testChangeRateConfigSettings2() throws Exception
+ {
+ Connection c = null;
+
+ try
+ {
+ String mbeanConfig = "<mbean code=\"org.jboss.jms.server.connectionfactory.ConnectionFactory\"\n" + " name=\"jboss.messaging.connectionfactory:service=TestChangeRateConfigSettingsFactory\"\n"
+ + " xmbean-dd=\"xmdesc/ConnectionFactory-xmbean.xml\">\n"
+ + " <depends optional-attribute-name=\"ServerPeer\">jboss.messaging:service=ServerPeer</depends>\n"
+ + " <depends optional-attribute-name=\"Connector\">jboss.messaging:service=Connector,transport=bisocket</depends>\n"
+ + " <attribute name=\"JNDIBindings\">\n"
+ + " <bindings>\n"
+ + " <binding>/ClusteredTestChangeRateConfigSettingsFactory</binding>\n"
+ + " </bindings>\n"
+ + " </attribute>\n"
+ + " <attribute name=\"SupportsFailover\">false</attribute>"
+ + " <attribute name=\"SupportsLoadBalancing\">true</attribute>"
+ + " <attribute name=\"MaxRetryChangeRate\">10</attribute>\n"
+ + " <attribute name=\"RetryChangeRateInterval\">2345</attribute>\n"
+ + " </mbean>";
+
+ ObjectName on = ServerManagement.deploy(mbeanConfig);
+ ServerManagement.invoke(on, "create", new Object[0], new String[0]);
+ ServerManagement.invoke(on, "start", new Object[0], new String[0]);
+
+ ConnectionFactory cf = (ConnectionFactory)ic[0].lookup("/ClusteredTestChangeRateConfigSettingsFactory");
+ c = cf.createConnection();
+
+ ClientConnectionDelegate del1 = (ClientConnectionDelegate)((JBossConnection)c).getDelegate();
+
+ ConnectionState state1 = (ConnectionState)del1.getState();
+
+ long maxRetry = state1.getMaxRetryChangeRate();
+
+ assertEquals(10, maxRetry);
+
+ long retryInterval = state1.getRetryChangeRateInterval();
+
+ assertEquals(2345, retryInterval);
+ }
+ finally
+ {
+ try
+ {
+ if (c != null)
+ {
+ log.info("Closing connection");
+ c.close();
+ log.info("Closed connection");
+ }
+ }
+ catch (Exception e)
+ {
+ log.warn(e.toString(), e);
+ }
+ }
+ }
+
+ //https://issues.jboss.org/browse/JBMESSAGING-1851
+ public void testChangeRateConfigDefaults() throws Exception
+ {
+ Connection c = null;
+
+ try
+ {
+ String mbeanConfig = "<mbean code=\"org.jboss.jms.server.connectionfactory.ConnectionFactory\"\n" + " name=\"jboss.messaging.connectionfactory:service=TestChangeRateConfigDefaultsFactory\"\n"
+ + " xmbean-dd=\"xmdesc/ConnectionFactory-xmbean.xml\">\n"
+ + " <depends optional-attribute-name=\"ServerPeer\">jboss.messaging:service=ServerPeer</depends>\n"
+ + " <depends optional-attribute-name=\"Connector\">jboss.messaging:service=Connector,transport=bisocket</depends>\n"
+ + " <attribute name=\"JNDIBindings\">\n"
+ + " <bindings>\n"
+ + " <binding>/ClusteredTestChangeRateConfigDefaultsFactory</binding>\n"
+ + " </bindings>\n"
+ + " </attribute>\n"
+ + " <attribute name=\"SupportsFailover\">true</attribute>"
+ + " <attribute name=\"SupportsLoadBalancing\">true</attribute>"
+ + " </mbean>";
+
+ ObjectName on = ServerManagement.deploy(mbeanConfig);
+ ServerManagement.invoke(on, "create", new Object[0], new String[0]);
+ ServerManagement.invoke(on, "start", new Object[0], new String[0]);
+
+ ConnectionFactory cf = (ConnectionFactory)ic[0].lookup("/ClusteredTestChangeRateConfigDefaultsFactory");
+ c = cf.createConnection();
+
+ ClientConnectionDelegate del1 = (ClientConnectionDelegate)((JBossConnection)c).getDelegate();
+
+ ConnectionState state1 = (ConnectionState)del1.getState();
+
+ long maxRetry = state1.getMaxRetryChangeRate();
+
+ assertEquals(0, maxRetry);
+
+ long retryInterval = state1.getRetryChangeRateInterval();
+
+ assertEquals(5000, retryInterval);
+ }
+ finally
+ {
+ try
+ {
+ if (c != null)
+ {
+ log.info("Closing connection");
+ c.close();
+ log.info("Closed connection");
+ }
+ }
+ catch (Exception e)
+ {
+ log.warn(e.toString(), e);
+ }
+ }
+ }
+
// Package protected ----------------------------------------------------------------------------
// Protected ------------------------------------------------------------------------------------
More information about the jboss-cvs-commits
mailing list