JBoss hornetq SVN: r11116 - in branches/Branch_2_2_AS7: src/config/common and 1 other directory.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-08-04 08:41:38 -0400 (Thu, 04 Aug 2011)
New Revision: 11116
Modified:
branches/Branch_2_2_AS7/build-maven.xml
branches/Branch_2_2_AS7/pom.xml
branches/Branch_2_2_AS7/src/config/common/hornetq-version.properties
Log:
update version
Modified: branches/Branch_2_2_AS7/build-maven.xml
===================================================================
--- branches/Branch_2_2_AS7/build-maven.xml 2011-08-04 12:23:43 UTC (rev 11115)
+++ branches/Branch_2_2_AS7/build-maven.xml 2011-08-04 12:41:38 UTC (rev 11116)
@@ -13,7 +13,7 @@
-->
<project default="upload" name="HornetQ">
- <property name="hornetq.version" value="2.2.6.Final"/>
+ <property name="hornetq.version" value="2.2.7.Final"/>
<property name="build.dir" value="build"/>
<property name="jars.dir" value="${build.dir}/jars"/>
Modified: branches/Branch_2_2_AS7/pom.xml
===================================================================
--- branches/Branch_2_2_AS7/pom.xml 2011-08-04 12:23:43 UTC (rev 11115)
+++ branches/Branch_2_2_AS7/pom.xml 2011-08-04 12:41:38 UTC (rev 11116)
@@ -19,7 +19,7 @@
<groupId>org.hornetq</groupId>
<artifactId>messaging</artifactId>
<packaging>pom</packaging>
- <version>2.2.1.GA</version>
+ <version>2.2.7.Final</version>
<properties>
<resteasy.version>2.1.0.GA</resteasy.version>
Modified: branches/Branch_2_2_AS7/src/config/common/hornetq-version.properties
===================================================================
--- branches/Branch_2_2_AS7/src/config/common/hornetq-version.properties 2011-08-04 12:23:43 UTC (rev 11115)
+++ branches/Branch_2_2_AS7/src/config/common/hornetq-version.properties 2011-08-04 12:41:38 UTC (rev 11116)
@@ -1,7 +1,7 @@
-hornetq.version.versionName=HQ_2_2_6_FINAL_AS7
+hornetq.version.versionName=HQ_2_2_7_FINAL_AS7
hornetq.version.majorVersion=2
hornetq.version.minorVersion=2
-hornetq.version.microVersion=6
+hornetq.version.microVersion=7
hornetq.version.incrementingVersion=121
hornetq.version.versionSuffix=Final
hornetq.version.versionTag=Final
13 years, 5 months
JBoss hornetq SVN: r11115 - branches/Branch_2_2_AS7/src/main/org/hornetq/jms/server/impl.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-08-04 08:23:43 -0400 (Thu, 04 Aug 2011)
New Revision: 11115
Modified:
branches/Branch_2_2_AS7/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
Log:
https://issues.jboss.org/browse/HORNETQ-750
Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- branches/Branch_2_2_AS7/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2011-08-04 10:56:11 UTC (rev 11114)
+++ branches/Branch_2_2_AS7/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2011-08-04 12:23:43 UTC (rev 11115)
@@ -103,11 +103,6 @@
private BindingRegistry registry;
- /**
- * the context to bind to
- */
- private Context context;
-
private Map<String, HornetQQueue> queues = new HashMap<String, HornetQQueue>();
private Map<String, HornetQTopic> topics = new HashMap<String, HornetQTopic>();
@@ -264,8 +259,7 @@
if (registry == null)
{
if (!contextSet)
- context = new InitialContext();
- registry = new JndiBindingRegistry(context);
+ registry = new JndiBindingRegistry(new InitialContext());
}
deploymentManager = new FileDeploymentManager(server.getConfiguration().getFileDeployerScanPeriod());
@@ -326,9 +320,9 @@
topicJNDI.clear();
topics.clear();
- if (context != null)
+ if (registry != null)
{
- context.close();
+ registry.close();
}
// it could be null if a backup
@@ -388,10 +382,9 @@
public synchronized void setContext(final Context context)
{
- this.context = context;
-
- if (registry != null && registry instanceof JndiBindingRegistry)
+ if (registry == null || registry instanceof JndiBindingRegistry)
{
+ registry = new JndiBindingRegistry(context);
registry.setContext(context);
}
@@ -1469,7 +1462,7 @@
*/
private void unbindJNDI(Map<String, List<String>> param)
{
- if (context != null)
+ if (registry != null)
{
for (List<String> elementList : param.values())
{
@@ -1477,7 +1470,7 @@
{
try
{
- context.unbind(key);
+ registry.unbind(key);
}
catch (Exception e)
{
@@ -1608,13 +1601,13 @@
{
keys.remove(name);
}
- if (context != null)
+ if (registry != null)
{
Iterator<String> iter = jndiBindings.iterator();
while (iter.hasNext())
{
String jndiBinding = iter.next();
- context.unbind(jndiBinding);
+ registry.unbind(jndiBinding);
iter.remove();
}
}
@@ -1634,7 +1627,7 @@
if (jndiBindings.remove(jndi))
{
- context.unbind(jndi);
+ registry.unbind(jndi);
return true;
}
else
13 years, 5 months
JBoss hornetq SVN: r11113 - in branches/HORNETQ-720_Replication: hornetq-bootstrap and 4 other directories.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-08-04 06:53:18 -0400 (Thu, 04 Aug 2011)
New Revision: 11113
Modified:
branches/HORNETQ-720_Replication/
branches/HORNETQ-720_Replication/.project
branches/HORNETQ-720_Replication/hornetq-bootstrap/pom.xml
branches/HORNETQ-720_Replication/hornetq-ra/pom.xml
branches/HORNETQ-720_Replication/hornetq-rest/hornetq-rest/pom.xml
branches/HORNETQ-720_Replication/tests/joram-tests/pom.xml
branches/HORNETQ-720_Replication/tests/pom.xml
Log:
merge from trunk
Property changes on: branches/HORNETQ-720_Replication
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:10878-11100
+ /trunk:10878-11112
Modified: branches/HORNETQ-720_Replication/.project
===================================================================
--- branches/HORNETQ-720_Replication/.project 2011-08-04 09:48:05 UTC (rev 11112)
+++ branches/HORNETQ-720_Replication/.project 2011-08-04 10:53:18 UTC (rev 11113)
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sourceforge.metrics.nature</nature>
Modified: branches/HORNETQ-720_Replication/hornetq-bootstrap/pom.xml
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-bootstrap/pom.xml 2011-08-04 09:48:05 UTC (rev 11112)
+++ branches/HORNETQ-720_Replication/hornetq-bootstrap/pom.xml 2011-08-04 10:53:18 UTC (rev 11113)
@@ -10,7 +10,6 @@
<artifactId>hornetq-bootstrap</artifactId>
<packaging>jar</packaging>
- <version>2.2.3-SNAPSHOT</version>
<name>HornetQ Bootstrap</name>
<dependencies>
@@ -22,12 +21,10 @@
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>2.0.6.GA</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
- <version>2.2.14.GA</version>
</dependency>
</dependencies>
Modified: branches/HORNETQ-720_Replication/hornetq-ra/pom.xml
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-ra/pom.xml 2011-08-04 09:48:05 UTC (rev 11112)
+++ branches/HORNETQ-720_Replication/hornetq-ra/pom.xml 2011-08-04 10:53:18 UTC (rev 11113)
@@ -1,4 +1,5 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<name>HornetQ RAR POM</name>
<modelVersion>4.0.0</modelVersion>
Modified: branches/HORNETQ-720_Replication/hornetq-rest/hornetq-rest/pom.xml
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-rest/hornetq-rest/pom.xml 2011-08-04 09:48:05 UTC (rev 11112)
+++ branches/HORNETQ-720_Replication/hornetq-rest/hornetq-rest/pom.xml 2011-08-04 10:53:18 UTC (rev 11113)
@@ -7,7 +7,6 @@
<version>2.2.3-SNAPSHOT</version>
</parent>
- <groupId>org.hornetq.rest</groupId>
<artifactId>hornetq-rest</artifactId>
<packaging>jar</packaging>
<name>HornetQ REST Interface Implementation</name>
Modified: branches/HORNETQ-720_Replication/tests/joram-tests/pom.xml
===================================================================
--- branches/HORNETQ-720_Replication/tests/joram-tests/pom.xml 2011-08-04 09:48:05 UTC (rev 11112)
+++ branches/HORNETQ-720_Replication/tests/joram-tests/pom.xml 2011-08-04 10:53:18 UTC (rev 11113)
@@ -20,7 +20,6 @@
<version>2.2.3-SNAPSHOT</version>
</parent>
- <groupId>org.hornetq.tests</groupId>
<artifactId>joram-tests</artifactId>
<packaging>jar</packaging>
<name>HornetQ Joram Tests</name>
Modified: branches/HORNETQ-720_Replication/tests/pom.xml
===================================================================
--- branches/HORNETQ-720_Replication/tests/pom.xml 2011-08-04 09:48:05 UTC (rev 11112)
+++ branches/HORNETQ-720_Replication/tests/pom.xml 2011-08-04 10:53:18 UTC (rev 11113)
@@ -1,4 +1,5 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-pom</artifactId>
13 years, 5 months
JBoss hornetq SVN: r11112 - trunk.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-08-04 05:48:05 -0400 (Thu, 04 Aug 2011)
New Revision: 11112
Modified:
trunk/.project
Log:
Eclipse 3.7 adds these to .project.
Modified: trunk/.project
===================================================================
--- trunk/.project 2011-08-04 09:47:53 UTC (rev 11111)
+++ trunk/.project 2011-08-04 09:48:05 UTC (rev 11112)
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sourceforge.metrics.nature</nature>
13 years, 5 months
JBoss hornetq SVN: r11111 - in trunk: hornetq-ra and 3 other directories.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-08-04 05:47:53 -0400 (Thu, 04 Aug 2011)
New Revision: 11111
Modified:
trunk/hornetq-bootstrap/pom.xml
trunk/hornetq-ra/pom.xml
trunk/hornetq-rest/hornetq-rest/pom.xml
trunk/tests/joram-tests/pom.xml
trunk/tests/pom.xml
Log:
Fix Maven warnings.
Modified: trunk/hornetq-bootstrap/pom.xml
===================================================================
--- trunk/hornetq-bootstrap/pom.xml 2011-08-04 08:58:14 UTC (rev 11110)
+++ trunk/hornetq-bootstrap/pom.xml 2011-08-04 09:47:53 UTC (rev 11111)
@@ -10,7 +10,6 @@
<artifactId>hornetq-bootstrap</artifactId>
<packaging>jar</packaging>
- <version>2.2.3-SNAPSHOT</version>
<name>HornetQ Bootstrap</name>
<dependencies>
@@ -22,12 +21,10 @@
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>2.0.6.GA</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
- <version>2.2.14.GA</version>
</dependency>
</dependencies>
Modified: trunk/hornetq-ra/pom.xml
===================================================================
--- trunk/hornetq-ra/pom.xml 2011-08-04 08:58:14 UTC (rev 11110)
+++ trunk/hornetq-ra/pom.xml 2011-08-04 09:47:53 UTC (rev 11111)
@@ -1,4 +1,5 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<name>HornetQ RAR POM</name>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/hornetq-rest/hornetq-rest/pom.xml
===================================================================
--- trunk/hornetq-rest/hornetq-rest/pom.xml 2011-08-04 08:58:14 UTC (rev 11110)
+++ trunk/hornetq-rest/hornetq-rest/pom.xml 2011-08-04 09:47:53 UTC (rev 11111)
@@ -7,7 +7,6 @@
<version>2.2.3-SNAPSHOT</version>
</parent>
- <groupId>org.hornetq.rest</groupId>
<artifactId>hornetq-rest</artifactId>
<packaging>jar</packaging>
<name>HornetQ REST Interface Implementation</name>
Modified: trunk/tests/joram-tests/pom.xml
===================================================================
--- trunk/tests/joram-tests/pom.xml 2011-08-04 08:58:14 UTC (rev 11110)
+++ trunk/tests/joram-tests/pom.xml 2011-08-04 09:47:53 UTC (rev 11111)
@@ -20,7 +20,6 @@
<version>2.2.3-SNAPSHOT</version>
</parent>
- <groupId>org.hornetq.tests</groupId>
<artifactId>joram-tests</artifactId>
<packaging>jar</packaging>
<name>HornetQ Joram Tests</name>
Modified: trunk/tests/pom.xml
===================================================================
--- trunk/tests/pom.xml 2011-08-04 08:58:14 UTC (rev 11110)
+++ trunk/tests/pom.xml 2011-08-04 09:47:53 UTC (rev 11111)
@@ -1,4 +1,5 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-pom</artifactId>
13 years, 5 months
JBoss hornetq SVN: r11110 - branches/Branch_2_2_AS7/src/main/org/hornetq/utils.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-08-04 04:58:14 -0400 (Thu, 04 Aug 2011)
New Revision: 11110
Modified:
branches/Branch_2_2_AS7/src/main/org/hornetq/utils/ObjectInputStreamWithClassLoader.java
Log:
https://issues.jboss.org/browse/HORNETQ-747
Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/utils/ObjectInputStreamWithClassLoader.java
===================================================================
--- branches/Branch_2_2_AS7/src/main/org/hornetq/utils/ObjectInputStreamWithClassLoader.java 2011-08-04 02:42:28 UTC (rev 11109)
+++ branches/Branch_2_2_AS7/src/main/org/hornetq/utils/ObjectInputStreamWithClassLoader.java 2011-08-04 08:58:14 UTC (rev 11110)
@@ -53,7 +53,9 @@
ClassLoader loader = Thread.currentThread().getContextClassLoader();
try
{
- Class clazz = loader.loadClass(name);
+ // HORNETQ-747 https://issues.jboss.org/browse/HORNETQ-747
+ // Use Class.forName instead of ClassLoader.loadClass to avoid issues with loading arrays
+ Class clazz = Class.forName(name, false, loader);
// sanity check only.. if a classLoader can't find a clazz, it will throw an exception
if (clazz == null)
{
13 years, 5 months
JBoss hornetq SVN: r11109 - branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/distribution.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-08-03 22:42:28 -0400 (Wed, 03 Aug 2011)
New Revision: 11109
Modified:
branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
Log:
tweak
Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-08-04 02:34:21 UTC (rev 11108)
+++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-08-04 02:42:28 UTC (rev 11109)
@@ -2050,8 +2050,6 @@
{
try
{
- // We need to wait a
- Thread.sleep(500);
ClusterTestBase.log.info("stopping server " + node);
servers[node].stop();
ClusterTestBase.log.info("server " + node + " stopped");
13 years, 5 months
JBoss hornetq SVN: r11108 - branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-08-03 22:34:21 -0400 (Wed, 03 Aug 2011)
New Revision: 11108
Modified:
branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java
Log:
tweak
Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2011-08-03 22:16:02 UTC (rev 11107)
+++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2011-08-04 02:34:21 UTC (rev 11108)
@@ -81,10 +81,10 @@
}
});
}
-
+
public void _testLoop() throws Throwable
{
- for (int i = 0 ; i < 1000; i++)
+ for (int i = 0; i < 1000; i++)
{
log.info("#test " + i);
testTransactional();
@@ -182,69 +182,73 @@
locator.setBlockOnDurableSend(true);
locator.setReconnectAttempts(-1);
locator.setConfirmationWindowSize(10 * 1024 * 1024);
- sf = (ClientSessionFactoryInternal) createSessionFactoryAndWaitForTopology(locator, 2);
+ sf = (ClientSessionFactoryInternal)createSessionFactoryAndWaitForTopology(locator, 2);
+ try
+ {
+ ClientSession createSession = sf.createSession(true, true);
- ClientSession createSession = sf.createSession(true, true);
+ createSession.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true);
- createSession.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true);
+ RemotingConnection conn = ((ClientSessionInternal)createSession).getConnection();
- RemotingConnection conn = ((ClientSessionInternal)createSession).getConnection();
+ Thread t = new Thread(runnable);
- Thread t = new Thread(runnable);
+ t.setName("MainTEST");
- t.setName("MainTEST");
+ t.start();
- t.start();
+ long randomDelay = (long)(2000 * Math.random());
- long randomDelay = (long)(2000 * Math.random());
+ AsynchronousFailoverTest.log.info("Sleeping " + randomDelay);
- AsynchronousFailoverTest.log.info("Sleeping " + randomDelay);
+ Thread.sleep(randomDelay);
- Thread.sleep(randomDelay);
+ AsynchronousFailoverTest.log.info("Failing asynchronously");
- AsynchronousFailoverTest.log.info("Failing asynchronously");
-
- MyListener listener = this.listener;
-
- // Simulate failure on connection
- synchronized (lockFail)
- {
- if (log.isDebugEnabled())
+ // Simulate failure on connection
+ synchronized (lockFail)
{
- log.debug("#test crashing test");
+ if (log.isDebugEnabled())
+ {
+ log.debug("#test crashing test");
+ }
+ crash((ClientSession)createSession);
}
- crash((ClientSession) createSession);
- }
- /*if (listener != null)
- {
- boolean ok = listener.latch.await(10000, TimeUnit.MILLISECONDS);
+ /*if (listener != null)
+ {
+ boolean ok = listener.latch.await(10000, TimeUnit.MILLISECONDS);
- Assert.assertTrue(ok);
- }*/
+ Assert.assertTrue(ok);
+ }*/
- runnable.setFailed();
+ runnable.setFailed();
- AsynchronousFailoverTest.log.info("Fail complete");
+ AsynchronousFailoverTest.log.info("Fail complete");
- t.join();
+ t.join();
- runnable.checkForExceptions();
+ runnable.checkForExceptions();
- createSession.close();
+ createSession.close();
- if (sf.numSessions() != 0)
+ if (sf.numSessions() != 0)
+ {
+ DelegatingSession.dumpSessionCreationStacks();
+ }
+
+ Assert.assertEquals(0, sf.numSessions());
+
+ locator.close();
+ }
+ finally
{
- DelegatingSession.dumpSessionCreationStacks();
+ locator.close();
+
+ Assert.assertEquals(0, sf.numConnections());
}
- Assert.assertEquals(0, sf.numSessions());
-
- locator.close();
-
- Assert.assertEquals(0, sf.numConnections());
-
if (i != numIts - 1)
{
tearDown();
@@ -259,7 +263,7 @@
DelegatingSession.debug = false;
}
}
-
+
protected void addPayload(ClientMessage msg)
{
}
@@ -294,7 +298,7 @@
message.getBodyBuffer().writeString("message" + i);
message.putIntProperty("counter", i);
-
+
addPayload(message);
producer.send(message);
@@ -304,7 +308,7 @@
catch (HornetQException e)
{
AsynchronousFailoverTest.log.info("exception when sending message with counter " + i);
- if(e.getCode() != HornetQException.UNBLOCKED)
+ if (e.getCode() != HornetQException.UNBLOCKED)
{
e.printStackTrace();
}
@@ -386,13 +390,13 @@
{
// For duplication detection
int executionId = 0;
-
+
while (!runner.isFailed())
{
ClientSession session = null;
executionId++;
-
+
log.info("#test doTestTransactional starting now. Execution " + executionId);
try
@@ -426,14 +430,14 @@
message.putStringProperty(Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("id:" + i +
",exec:" +
executionId));
-
+
addPayload(message);
if (log.isDebugEnabled())
{
log.debug("Sending message " + message);
}
-
+
producer.send(message);
}
@@ -449,8 +453,7 @@
logAndSystemOut("#test duplicate id rejected on sending");
break;
}
- else
- if (e.getCode() == HornetQException.TRANSACTION_ROLLED_BACK || e.getCode() == HornetQException.UNBLOCKED)
+ else if (e.getCode() == HornetQException.TRANSACTION_ROLLED_BACK || e.getCode() == HornetQException.UNBLOCKED)
{
log.info("#test transaction rollback retrying on sending");
// OK
@@ -466,14 +469,13 @@
while (retry);
logAndSystemOut("#test Finished sending, starting consumption now");
-
-
+
boolean blocked = false;
retry = false;
ArrayList<Integer> msgs = new ArrayList<Integer>();
-
- ClientConsumer consumer = null;
+
+ ClientConsumer consumer = null;
do
{
msgs.clear();
@@ -496,14 +498,14 @@
{
break;
}
-
+
if (log.isDebugEnabled())
{
log.debug("Received message " + message);
}
int count = message.getIntProperty("counter");
-
+
if (count != i)
{
log.warn("count was received out of order, " + count + "!=" + i);
@@ -521,11 +523,13 @@
{
if (blocked)
{
- assertTrue("msgs.size is expected to be 0 or " + numMessages + " but it was " + msgs.size(), msgs.size() == 0 || msgs.size() == numMessages);
+ assertTrue("msgs.size is expected to be 0 or " + numMessages + " but it was " + msgs.size(),
+ msgs.size() == 0 || msgs.size() == numMessages);
}
else
{
- assertTrue("msgs.size is expected to be " + numMessages + " but it was " + msgs.size(), msgs.size() == numMessages);
+ assertTrue("msgs.size is expected to be " + numMessages + " but it was " + msgs.size(),
+ msgs.size() == numMessages);
}
}
catch (Throwable e)
13 years, 5 months
JBoss hornetq SVN: r11107 - branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/reattach.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-08-03 18:16:02 -0400 (Wed, 03 Aug 2011)
New Revision: 11107
Modified:
branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java
Log:
fixing test
Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java 2011-08-03 21:18:53 UTC (rev 11106)
+++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java 2011-08-03 22:16:02 UTC (rev 11107)
@@ -41,15 +41,6 @@
*/
public class OrderReattachTest extends ServiceTestBase
{
-
- // Disabled for now... under investigation (Clebert)
- public static TestSuite suite()
- {
- TestSuite suite = new TestSuite();
-
- return suite;
- }
-
// Constants -----------------------------------------------------
final SimpleString ADDRESS = new SimpleString("address");
@@ -67,13 +58,7 @@
public void testOrderOnSendInVM() throws Throwable
{
- for (int i = 0; i < 500; i++)
- {
- log.info("#" + getName() + " # " + i);
- doTestOrderOnSend(false);
- tearDown();
- setUp();
- }
+ doTestOrderOnSend(false);
}
public void doTestOrderOnSend(final boolean isNetty) throws Throwable
@@ -83,7 +68,7 @@
server.start();
ServerLocator locator = createFactory(isNetty);
locator.setReconnectAttempts(-1);
- locator.setConfirmationWindowSize(100 * 1024 * 1024);
+ locator.setConfirmationWindowSize(1024 * 1024);
locator.setBlockOnNonDurableSend(false);
locator.setBlockOnAcknowledge(false);
ClientSessionFactory sf = locator.createSessionFactory();
@@ -192,7 +177,7 @@
final int numMessages = 500;
- final int numSessions = 100;
+ final int numSessions = 10;
Set<ClientConsumer> consumers = new HashSet<ClientConsumer>();
Set<ClientSession> sessions = new HashSet<ClientSession>();
13 years, 5 months