JBoss hornetq SVN: r10346 - in branches/Branch_2_2_EAP/examples/javaee: jca-config/server and 14 other directories.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-03-18 08:10:55 -0400 (Fri, 18 Mar 2011)
New Revision: 10346
Modified:
branches/Branch_2_2_EAP/examples/javaee/ejb-jms-transaction/server/hornetq-configuration.xml
branches/Branch_2_2_EAP/examples/javaee/jca-config/server/hornetq-configuration.xml
branches/Branch_2_2_EAP/examples/javaee/jca-config/server2/hornetq-configuration.xml
branches/Branch_2_2_EAP/examples/javaee/jca-remote/server/hornetq-configuration.xml
branches/Branch_2_2_EAP/examples/javaee/jca-remote/server0/hornetq-configuration.xml
branches/Branch_2_2_EAP/examples/javaee/jms-bridge/server/hornetq-configuration.xml
branches/Branch_2_2_EAP/examples/javaee/mdb-bmt/server/hornetq-configuration.xml
branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml
branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml
branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml
branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml
branches/Branch_2_2_EAP/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml
branches/Branch_2_2_EAP/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml
branches/Branch_2_2_EAP/examples/javaee/servlet-ssl/server/hornetq-configuration.xml
branches/Branch_2_2_EAP/examples/javaee/servlet-transport/server/hornetq-configuration.xml
branches/Branch_2_2_EAP/examples/javaee/xarecovery/server/hornetq-configuration.xml
Log:
fixed javaee examples
Modified: branches/Branch_2_2_EAP/examples/javaee/ejb-jms-transaction/server/hornetq-configuration.xml
===================================================================
--- branches/Branch_2_2_EAP/examples/javaee/ejb-jms-transaction/server/hornetq-configuration.xml 2011-03-18 12:08:16 UTC (rev 10345)
+++ branches/Branch_2_2_EAP/examples/javaee/ejb-jms-transaction/server/hornetq-configuration.xml 2011-03-18 12:10:55 UTC (rev 10346)
@@ -2,6 +2,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+ <!-- Don't change this name.
+ This is used by the dependency framework on the deployers,
+ to make sure this deployment is done before any other deployment -->
+ <name>HornetQ.main.config</name>
+
<bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
<journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
Modified: branches/Branch_2_2_EAP/examples/javaee/jca-config/server/hornetq-configuration.xml
===================================================================
--- branches/Branch_2_2_EAP/examples/javaee/jca-config/server/hornetq-configuration.xml 2011-03-18 12:08:16 UTC (rev 10345)
+++ branches/Branch_2_2_EAP/examples/javaee/jca-config/server/hornetq-configuration.xml 2011-03-18 12:10:55 UTC (rev 10346)
@@ -2,6 +2,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+ <!-- Don't change this name.
+ This is used by the dependency framework on the deployers,
+ to make sure this deployment is done before any other deployment -->
+ <name>HornetQ.main.config</name>
+
+
<bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
<journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
Modified: branches/Branch_2_2_EAP/examples/javaee/jca-config/server2/hornetq-configuration.xml
===================================================================
--- branches/Branch_2_2_EAP/examples/javaee/jca-config/server2/hornetq-configuration.xml 2011-03-18 12:08:16 UTC (rev 10345)
+++ branches/Branch_2_2_EAP/examples/javaee/jca-config/server2/hornetq-configuration.xml 2011-03-18 12:10:55 UTC (rev 10346)
@@ -10,6 +10,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+ <!-- Don't change this name.
+ This is used by the dependency framework on the deployers,
+ to make sure this deployment is done before any other deployment -->
+ <name>HornetQ.main.config</name>
+
+
<bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
<journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
Modified: branches/Branch_2_2_EAP/examples/javaee/jca-remote/server/hornetq-configuration.xml
===================================================================
--- branches/Branch_2_2_EAP/examples/javaee/jca-remote/server/hornetq-configuration.xml 2011-03-18 12:08:16 UTC (rev 10345)
+++ branches/Branch_2_2_EAP/examples/javaee/jca-remote/server/hornetq-configuration.xml 2011-03-18 12:10:55 UTC (rev 10346)
@@ -15,6 +15,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+ <!-- Don't change this name.
+ This is used by the dependency framework on the deployers,
+ to make sure this deployment is done before any other deployment -->
+ <name>HornetQ.main.config</name>
+
+
<bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
<journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
Modified: branches/Branch_2_2_EAP/examples/javaee/jca-remote/server0/hornetq-configuration.xml
===================================================================
--- branches/Branch_2_2_EAP/examples/javaee/jca-remote/server0/hornetq-configuration.xml 2011-03-18 12:08:16 UTC (rev 10345)
+++ branches/Branch_2_2_EAP/examples/javaee/jca-remote/server0/hornetq-configuration.xml 2011-03-18 12:10:55 UTC (rev 10346)
@@ -15,6 +15,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+ <!-- Don't change this name.
+ This is used by the dependency framework on the deployers,
+ to make sure this deployment is done before any other deployment -->
+ <name>HornetQ.main.config</name>
+
+
<!-- Connectors -->
<connectors>
Modified: branches/Branch_2_2_EAP/examples/javaee/jms-bridge/server/hornetq-configuration.xml
===================================================================
--- branches/Branch_2_2_EAP/examples/javaee/jms-bridge/server/hornetq-configuration.xml 2011-03-18 12:08:16 UTC (rev 10345)
+++ branches/Branch_2_2_EAP/examples/javaee/jms-bridge/server/hornetq-configuration.xml 2011-03-18 12:10:55 UTC (rev 10346)
@@ -2,6 +2,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+ <!-- Don't change this name.
+ This is used by the dependency framework on the deployers,
+ to make sure this deployment is done before any other deployment -->
+ <name>HornetQ.main.config</name>
+
+
<!-- Connectors -->
<connectors>
<connector name="netty">
Modified: branches/Branch_2_2_EAP/examples/javaee/mdb-bmt/server/hornetq-configuration.xml
===================================================================
--- branches/Branch_2_2_EAP/examples/javaee/mdb-bmt/server/hornetq-configuration.xml 2011-03-18 12:08:16 UTC (rev 10345)
+++ branches/Branch_2_2_EAP/examples/javaee/mdb-bmt/server/hornetq-configuration.xml 2011-03-18 12:10:55 UTC (rev 10346)
@@ -2,6 +2,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+ <!-- Don't change this name.
+ This is used by the dependency framework on the deployers,
+ to make sure this deployment is done before any other deployment -->
+ <name>HornetQ.main.config</name>
+
+
<bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
<journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
Modified: branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml
===================================================================
--- branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml 2011-03-18 12:08:16 UTC (rev 10345)
+++ branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml 2011-03-18 12:10:55 UTC (rev 10346)
@@ -2,6 +2,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+ <!-- Don't change this name.
+ This is used by the dependency framework on the deployers,
+ to make sure this deployment is done before any other deployment -->
+ <name>HornetQ.main.config</name>
+
+
<bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
<journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
Modified: branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml
===================================================================
--- branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml 2011-03-18 12:08:16 UTC (rev 10345)
+++ branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml 2011-03-18 12:10:55 UTC (rev 10346)
@@ -2,6 +2,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+ <!-- Don't change this name.
+ This is used by the dependency framework on the deployers,
+ to make sure this deployment is done before any other deployment -->
+ <name>HornetQ.main.config</name>
+
+
<bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
<journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
Modified: branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml
===================================================================
--- branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml 2011-03-18 12:08:16 UTC (rev 10345)
+++ branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml 2011-03-18 12:10:55 UTC (rev 10346)
@@ -2,6 +2,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+ <!-- Don't change this name.
+ This is used by the dependency framework on the deployers,
+ to make sure this deployment is done before any other deployment -->
+ <name>HornetQ.main.config</name>
+
+
<bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
<journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
Modified: branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml
===================================================================
--- branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml 2011-03-18 12:08:16 UTC (rev 10345)
+++ branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml 2011-03-18 12:10:55 UTC (rev 10346)
@@ -2,6 +2,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+ <!-- Don't change this name.
+ This is used by the dependency framework on the deployers,
+ to make sure this deployment is done before any other deployment -->
+ <name>HornetQ.main.config</name>
+
+
<bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
<journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
Modified: branches/Branch_2_2_EAP/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml
===================================================================
--- branches/Branch_2_2_EAP/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml 2011-03-18 12:08:16 UTC (rev 10345)
+++ branches/Branch_2_2_EAP/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml 2011-03-18 12:10:55 UTC (rev 10346)
@@ -2,6 +2,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+ <!-- Don't change this name.
+ This is used by the dependency framework on the deployers,
+ to make sure this deployment is done before any other deployment -->
+ <name>HornetQ.main.config</name>
+
+
<bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
<journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
Modified: branches/Branch_2_2_EAP/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml
===================================================================
--- branches/Branch_2_2_EAP/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml 2011-03-18 12:08:16 UTC (rev 10345)
+++ branches/Branch_2_2_EAP/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml 2011-03-18 12:10:55 UTC (rev 10346)
@@ -2,6 +2,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+ <!-- Don't change this name.
+ This is used by the dependency framework on the deployers,
+ to make sure this deployment is done before any other deployment -->
+ <name>HornetQ.main.config</name>
+
+
<bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
<journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
Modified: branches/Branch_2_2_EAP/examples/javaee/servlet-ssl/server/hornetq-configuration.xml
===================================================================
--- branches/Branch_2_2_EAP/examples/javaee/servlet-ssl/server/hornetq-configuration.xml 2011-03-18 12:08:16 UTC (rev 10345)
+++ branches/Branch_2_2_EAP/examples/javaee/servlet-ssl/server/hornetq-configuration.xml 2011-03-18 12:10:55 UTC (rev 10346)
@@ -2,6 +2,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+ <!-- Don't change this name.
+ This is used by the dependency framework on the deployers,
+ to make sure this deployment is done before any other deployment -->
+ <name>HornetQ.main.config</name>
+
+
<bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
<journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
Modified: branches/Branch_2_2_EAP/examples/javaee/servlet-transport/server/hornetq-configuration.xml
===================================================================
--- branches/Branch_2_2_EAP/examples/javaee/servlet-transport/server/hornetq-configuration.xml 2011-03-18 12:08:16 UTC (rev 10345)
+++ branches/Branch_2_2_EAP/examples/javaee/servlet-transport/server/hornetq-configuration.xml 2011-03-18 12:10:55 UTC (rev 10346)
@@ -2,6 +2,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+ <!-- Don't change this name.
+ This is used by the dependency framework on the deployers,
+ to make sure this deployment is done before any other deployment -->
+ <name>HornetQ.main.config</name>
+
+
<bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
<journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
Modified: branches/Branch_2_2_EAP/examples/javaee/xarecovery/server/hornetq-configuration.xml
===================================================================
--- branches/Branch_2_2_EAP/examples/javaee/xarecovery/server/hornetq-configuration.xml 2011-03-18 12:08:16 UTC (rev 10345)
+++ branches/Branch_2_2_EAP/examples/javaee/xarecovery/server/hornetq-configuration.xml 2011-03-18 12:10:55 UTC (rev 10346)
@@ -2,6 +2,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+ <!-- Don't change this name.
+ This is used by the dependency framework on the deployers,
+ to make sure this deployment is done before any other deployment -->
+ <name>HornetQ.main.config</name>
+
+
<bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
<journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
13 years, 9 months
JBoss hornetq SVN: r10345 - branches/Branch_2_2_EAP/examples/jms/transaction-failover.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-03-18 08:08:16 -0400 (Fri, 18 Mar 2011)
New Revision: 10345
Modified:
branches/Branch_2_2_EAP/examples/jms/transaction-failover/build.xml
Log:
fixed tx failover example
Modified: branches/Branch_2_2_EAP/examples/jms/transaction-failover/build.xml
===================================================================
--- branches/Branch_2_2_EAP/examples/jms/transaction-failover/build.xml 2011-03-18 06:09:59 UTC (rev 10344)
+++ branches/Branch_2_2_EAP/examples/jms/transaction-failover/build.xml 2011-03-18 12:08:16 UTC (rev 10345)
@@ -34,7 +34,7 @@
</target>
<target name="delete-files" depends="clean">
- <delete file="./server1/KILL_ME"/>
+ <delete file="./server0/KILL_ME"/>
</target>
</project>
13 years, 9 months
JBoss hornetq SVN: r10344 - in branches/Branch_2_2_EAP: src/main/org/hornetq/core/server/cluster/impl and 1 other directories.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-18 02:09:59 -0400 (Fri, 18 Mar 2011)
New Revision: 10344
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/Redistributor.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/MessageRedistributionTest.java
Log:
https://issues.jboss.org/browse/JBPAPP-6130 / https://issues.jboss.org/browse/HORNETQ-654 - fixing Redistribution issue over restart
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2011-03-18 04:54:45 UTC (rev 10343)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2011-03-18 06:09:59 UTC (rev 10344)
@@ -674,6 +674,12 @@
public boolean redistribute(final ServerMessage message, final Queue originatingQueue, final Transaction tx) throws Exception
{
+
+ // We have to copy the message and store it separately, otherwise we may lose remote bindings in case of restart before the message
+ // arrived the target node
+ // as described on https://issues.jboss.org/browse/JBPAPP-6130
+ ServerMessage copyRedistribute = message.copy(storageManager.generateUniqueID());
+
Bindings bindings = addressManager.getBindingsForRoutingAddress(message.getAddress());
boolean res = false;
@@ -682,12 +688,18 @@
{
RoutingContext context = new RoutingContextImpl(tx);
- boolean routed = bindings.redistribute(message, originatingQueue, context);
+ boolean routed = bindings.redistribute(copyRedistribute, originatingQueue, context);
if (routed)
{
- processRoute(message, context, false);
+ if (message.isDurable())
+ {
+ storageManager.storeMessageTransactional(tx.getID(), copyRedistribute);
+ tx.setContainsPersistent();
+ }
+ processRoute(copyRedistribute, context, false);
+
res = true;
}
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-03-18 04:54:45 UTC (rev 10343)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-03-18 06:09:59 UTC (rev 10344)
@@ -404,7 +404,7 @@
}
catch (HornetQException e)
{
- log.warn("Unable to send message, will try again once bridge reconnects");
+ log.warn("Unable to send message, will try again once bridge reconnects", e);
refs.remove(ref);
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/Redistributor.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/Redistributor.java 2011-03-18 04:54:45 UTC (rev 10343)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/Redistributor.java 2011-03-18 06:09:59 UTC (rev 10344)
@@ -127,7 +127,7 @@
if (routed)
{
- doRedistribute(reference, tx);
+ ackRedistribution(reference, tx);
return HandleStatus.HANDLED;
}
@@ -137,7 +137,7 @@
}
}
- private void doRedistribute(final MessageReference reference, final Transaction tx) throws Exception
+ private void ackRedistribution(final MessageReference reference, final Transaction tx) throws Exception
{
reference.handled();
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-03-18 04:54:45 UTC (rev 10343)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-03-18 06:09:59 UTC (rev 10344)
@@ -1132,9 +1132,13 @@
do
{
message = consumer.consumer.receive(500);
-
if (message != null)
{
+ if (ack)
+ {
+ message.acknowledge();
+ }
+
int count = (Integer)message.getObjectProperty(ClusterTestBase.COUNT_PROP);
ints.add(count);
@@ -1150,6 +1154,12 @@
{
res[j++] = i;
}
+
+ if (ack)
+ {
+ // just to flush acks
+ consumers[consumerID].session.commit();
+ }
return res;
}
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/MessageRedistributionTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/MessageRedistributionTest.java 2011-03-18 04:54:45 UTC (rev 10343)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/MessageRedistributionTest.java 2011-03-18 06:09:59 UTC (rev 10344)
@@ -107,7 +107,6 @@
MessageRedistributionTest.log.info("Test done");
}
- // https://issues.jboss.org/browse/JBPAPP-6130
// https://issues.jboss.org/browse/HORNETQ-654
public void testRedistributionWhenConsumerIsClosedAndRestart() throws Exception
{
@@ -137,7 +136,7 @@
waitForBindings(1, "queues.testaddress", 2, 2, false);
waitForBindings(2, "queues.testaddress", 2, 2, false);
- send(0, "queues.testaddress", 9, true, null);
+ send(0, "queues.testaddress", 20, true, null);
getReceivedOrder(0, true);
int[] ids1 = getReceivedOrder(1, false);
@@ -157,6 +156,9 @@
}
removeConsumer(1);
+
+ // Need to wait some time as we need to handle all redistributions before we stop the servers
+ Thread.sleep(5000);
for (int i = 0; i <= 2; i++)
{
@@ -181,16 +183,14 @@
setupSessionFactory(2, isNetty());
addConsumer(0, 0, "queue0", null);
- addConsumer(1, 1, "queue0", null);
addConsumer(2, 2, "queue0", null);
waitForBindings(0, "queues.testaddress", 1, 1, true);
- waitForBindings(1, "queues.testaddress", 1, 1, true);
waitForBindings(2, "queues.testaddress", 1, 1, true);
- waitForBindings(0, "queues.testaddress", 2, 2, false);
+ waitForBindings(0, "queues.testaddress", 2, 1, false);
waitForBindings(1, "queues.testaddress", 2, 2, false);
- waitForBindings(2, "queues.testaddress", 2, 2, false);
+ waitForBindings(2, "queues.testaddress", 2, 1, false);
verifyReceiveRoundRobinInSomeOrderWithCounts(false, ids1, 0, 2);
13 years, 9 months
JBoss hornetq SVN: r10343 - branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-18 00:54:45 -0400 (Fri, 18 Mar 2011)
New Revision: 10343
Modified:
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/MessageRedistributionTest.java
Log:
https://issues.jboss.org/browse/JBPAPP-6130 Adding failing test
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-03-18 00:11:19 UTC (rev 10342)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-03-18 04:54:45 UTC (rev 10343)
@@ -175,7 +175,7 @@
private static final int MAX_SERVERS = 10;
- private ConsumerHolder[] consumers;
+ protected ConsumerHolder[] consumers;
protected HornetQServer[] servers;
@@ -1113,6 +1113,11 @@
protected int[] getReceivedOrder(final int consumerID) throws Exception
{
+ return getReceivedOrder(consumerID, false);
+ }
+
+ protected int[] getReceivedOrder(final int consumerID, final boolean ack) throws Exception
+ {
ConsumerHolder consumer = consumers[consumerID];
if (consumer == null)
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/MessageRedistributionTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/MessageRedistributionTest.java 2011-03-18 00:11:19 UTC (rev 10342)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/MessageRedistributionTest.java 2011-03-18 04:54:45 UTC (rev 10343)
@@ -14,6 +14,9 @@
package org.hornetq.tests.integration.cluster.distribution;
import org.hornetq.core.logging.Logger;
+import org.hornetq.core.server.cluster.ClusterConnection;
+import org.hornetq.core.server.cluster.MessageFlowRecord;
+import org.hornetq.core.server.cluster.impl.ClusterConnectionImpl;
import org.hornetq.core.server.impl.QueueImpl;
import org.hornetq.core.settings.impl.AddressSettings;
@@ -104,7 +107,96 @@
MessageRedistributionTest.log.info("Test done");
}
+ // https://issues.jboss.org/browse/JBPAPP-6130
+ // https://issues.jboss.org/browse/HORNETQ-654
+ public void testRedistributionWhenConsumerIsClosedAndRestart() throws Exception
+ {
+ setupCluster(false);
+ MessageRedistributionTest.log.info("Doing test");
+
+ startServers(0, 1, 2);
+
+ setupSessionFactory(0, isNetty());
+ setupSessionFactory(1, isNetty());
+ setupSessionFactory(2, isNetty());
+
+ createQueue(0, "queues.testaddress", "queue0", null, true);
+ createQueue(1, "queues.testaddress", "queue0", null, true);
+ createQueue(2, "queues.testaddress", "queue0", null, true);
+
+ addConsumer(0, 0, "queue0", null);
+ addConsumer(1, 1, "queue0", null);
+ addConsumer(2, 2, "queue0", null);
+
+ waitForBindings(0, "queues.testaddress", 1, 1, true);
+ waitForBindings(1, "queues.testaddress", 1, 1, true);
+ waitForBindings(2, "queues.testaddress", 1, 1, true);
+
+ waitForBindings(0, "queues.testaddress", 2, 2, false);
+ waitForBindings(1, "queues.testaddress", 2, 2, false);
+ waitForBindings(2, "queues.testaddress", 2, 2, false);
+
+ send(0, "queues.testaddress", 9, true, null);
+
+ getReceivedOrder(0, true);
+ int[] ids1 = getReceivedOrder(1, false);
+ getReceivedOrder(2, true);
+
+ for (ClusterConnection conn : servers[1].getClusterManager().getClusterConnections())
+ {
+ ClusterConnectionImpl impl = (ClusterConnectionImpl)conn;
+ for (MessageFlowRecord record : impl.getRecords().values())
+ {
+ if (record.getBridge() != null)
+ {
+ System.out.println("stop record bridge");
+ record.getBridge().stop();
+ }
+ }
+ }
+
+ removeConsumer(1);
+
+ for (int i = 0; i <= 2; i++)
+ {
+ servers[i].stop();
+ servers[i] = null;
+ }
+
+ setupServers();
+
+ setupCluster(false);
+
+ startServers(0, 1, 2);
+
+ for (int i = 0 ; i <= 2; i++)
+ {
+ consumers[i] = null;
+ sfs[i] = null;
+ }
+
+ setupSessionFactory(0, isNetty());
+ setupSessionFactory(1, isNetty());
+ setupSessionFactory(2, isNetty());
+
+ addConsumer(0, 0, "queue0", null);
+ addConsumer(1, 1, "queue0", null);
+ addConsumer(2, 2, "queue0", null);
+
+ waitForBindings(0, "queues.testaddress", 1, 1, true);
+ waitForBindings(1, "queues.testaddress", 1, 1, true);
+ waitForBindings(2, "queues.testaddress", 1, 1, true);
+
+ waitForBindings(0, "queues.testaddress", 2, 2, false);
+ waitForBindings(1, "queues.testaddress", 2, 2, false);
+ waitForBindings(2, "queues.testaddress", 2, 2, false);
+
+ verifyReceiveRoundRobinInSomeOrderWithCounts(false, ids1, 0, 2);
+
+ MessageRedistributionTest.log.info("Test done");
+ }
+
public void testRedistributionWhenConsumerIsClosedNotConsumersOnAllNodes() throws Exception
{
setupCluster(false);
@@ -494,17 +586,16 @@
removeConsumer(1);
addConsumer(0, 0, QUEUE, null);
-
+
waitForMessages(1, ADDRESS, 0);
waitForMessages(0, ADDRESS, 20);
-
+
removeConsumer(0);
addConsumer(1, 1, QUEUE, null);
-
+
waitForMessages(1, ADDRESS, 20);
waitForMessages(0, ADDRESS, 0);
-
-
+
verifyReceiveAll(20, 1);
stop();
@@ -663,7 +754,7 @@
verifyReceiveAll(QueueImpl.REDISTRIBUTOR_BATCH_SIZE * 2, 1);
}
-
+
/*
* Start one node with no consumers and send some messages
* Start another node add a consumer and verify all messages are redistribute
@@ -676,26 +767,26 @@
startServers(0);
setupSessionFactory(0, isNetty());
-
+
createQueue(0, "queues.testaddress", "queue0", null, false);
-
+
waitForBindings(0, "queues.testaddress", 1, 0, true);
-
+
send(0, "queues.testaddress", 20, false, null);
-
- //Now bring up node 1
-
+
+ // Now bring up node 1
+
startServers(1);
setupSessionFactory(1, isNetty());
createQueue(1, "queues.testaddress", "queue0", null, false);
-
+
waitForBindings(1, "queues.testaddress", 1, 0, true);
waitForBindings(0, "queues.testaddress", 1, 0, false);
-
+
addConsumer(0, 1, "queue0", null);
-
+
verifyReceiveAll(20, 0);
verifyNotReceive(0);
}
13 years, 9 months
JBoss hornetq SVN: r10342 - branches/Branch_2_2_EAP/src/main/org/hornetq/core/journal/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-17 20:11:19 -0400 (Thu, 17 Mar 2011)
New Revision: 10342
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/journal/impl/JournalImpl.java
Log:
small tweak on tool used to debug journal data
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/journal/impl/JournalImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2011-03-17 13:36:04 UTC (rev 10341)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2011-03-18 00:11:19 UTC (rev 10342)
@@ -1539,7 +1539,7 @@
failureCallback.failedTransaction(transactionID, records, recordsToDelete);
}
}
- });
+ }, fixBadTX);
for (RecordInfo record : records)
{
13 years, 9 months
JBoss hornetq SVN: r10341 - in branches/Branch_2_2_EAP/examples: jms/transaction-failover/src/org/hornetq/jms/example and 1 other directory.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-03-17 09:36:04 -0400 (Thu, 17 Mar 2011)
New Revision: 10341
Modified:
branches/Branch_2_2_EAP/examples/common/src/org/hornetq/common/example/HornetQExample.java
branches/Branch_2_2_EAP/examples/jms/transaction-failover/src/org/hornetq/jms/example/TransactionFailoverExample.java
Log:
fixed tx failover example
Modified: branches/Branch_2_2_EAP/examples/common/src/org/hornetq/common/example/HornetQExample.java
===================================================================
--- branches/Branch_2_2_EAP/examples/common/src/org/hornetq/common/example/HornetQExample.java 2011-03-17 12:22:19 UTC (rev 10340)
+++ branches/Branch_2_2_EAP/examples/common/src/org/hornetq/common/example/HornetQExample.java 2011-03-17 13:36:04 UTC (rev 10341)
@@ -113,7 +113,7 @@
file.createNewFile();
// Sleep longer than the KillChecker check period
- Thread.sleep(1000);
+ Thread.sleep(3000);
}
protected void stopServer(final int id) throws Exception
Modified: branches/Branch_2_2_EAP/examples/jms/transaction-failover/src/org/hornetq/jms/example/TransactionFailoverExample.java
===================================================================
--- branches/Branch_2_2_EAP/examples/jms/transaction-failover/src/org/hornetq/jms/example/TransactionFailoverExample.java 2011-03-17 12:22:19 UTC (rev 10340)
+++ branches/Branch_2_2_EAP/examples/jms/transaction-failover/src/org/hornetq/jms/example/TransactionFailoverExample.java 2011-03-17 13:36:04 UTC (rev 10341)
@@ -151,9 +151,10 @@
if (killServer)
{
+ Thread.sleep(2000);
+
killServer(0);
- Thread.sleep(2000);
}
// We send the remaining half of messages
13 years, 9 months
JBoss hornetq SVN: r10340 - branches/Branch_2_2_EAP/examples/jms/transaction-failover/src/org/hornetq/jms/example.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-03-17 08:22:19 -0400 (Thu, 17 Mar 2011)
New Revision: 10340
Modified:
branches/Branch_2_2_EAP/examples/jms/transaction-failover/src/org/hornetq/jms/example/TransactionFailoverExample.java
Log:
fixed tx failover example
Modified: branches/Branch_2_2_EAP/examples/jms/transaction-failover/src/org/hornetq/jms/example/TransactionFailoverExample.java
===================================================================
--- branches/Branch_2_2_EAP/examples/jms/transaction-failover/src/org/hornetq/jms/example/TransactionFailoverExample.java 2011-03-15 13:29:39 UTC (rev 10339)
+++ branches/Branch_2_2_EAP/examples/jms/transaction-failover/src/org/hornetq/jms/example/TransactionFailoverExample.java 2011-03-17 12:22:19 UTC (rev 10340)
@@ -151,7 +151,7 @@
if (killServer)
{
- killServer(1);
+ killServer(0);
Thread.sleep(2000);
}
13 years, 9 months
JBoss hornetq SVN: r10339 - branches/Branch_2_2_EAP/docs/user-manual/en.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-03-15 09:29:39 -0400 (Tue, 15 Mar 2011)
New Revision: 10339
Modified:
branches/Branch_2_2_EAP/docs/user-manual/en/ha.xml
Log:
updated docs on XA and failover changes
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/ha.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/ha.xml 2011-03-15 11:38:30 UTC (rev 10338)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/ha.xml 2011-03-15 13:29:39 UTC (rev 10339)
@@ -256,6 +256,17 @@
<literal>HornetQException</literal> with error code <literal
>HornetQException.TRANSACTION_ROLLED_BACK</literal> if using the core
API.</para>
+ <warning>
+ <title>2 phase commit</title>
+ <para>
+ The caveat to this rule is when XA is used either via JMS or through the core API.
+ If 2 phase commit is used and prepare has already ben called then rolling back could
+ cause a <literal>HeuristicMixedException</literal>. Because of this there may be a
+ chance that any non persistent messages could be lost. To avoid this use persistent
+ messages when using XA. With acknowledgements this is not an issue since they are
+ flushed to the server before prepare gets called.
+ </para>
+ </warning>
<para>It is up to the user to catch the exception, and perform any client side local
rollback code as necessary. There is no need to manually rollback the session -
it is already rolled back. The user can then just retry the transactional
@@ -267,6 +278,15 @@
will come back. In this case it is not easy for the client to determine whether
the transaction commit was actually processed on the live server before failure
occurred.</para>
+ <note>
+ <para>
+ If XA is being used either via JMS or through the core API then an <literal>XAException.XA_RETRY</literal>
+ is thrown. This is to inform Transaction Managers that a retry should occur at some point. At
+ some later point in time the Transaction Manager will retry the commit. If the original
+ commit hadn't occurred then it will still exist and be committed, if it doesn't exist
+ then it is assumed to have been committed although the transaction manager may log a warning.
+ </para>
+ </note>
<para>To remedy this, the client can simply enable duplicate detection (<xref
linkend="duplicate-detection"/>) in the transaction, and retry the
transaction operations again after the call is unblocked. If the transaction had
13 years, 9 months
JBoss hornetq SVN: r10338 - in branches/Branch_2_2_EAP: src/main/org/hornetq/jms/client and 3 other directories.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-03-15 07:38:30 -0400 (Tue, 15 Mar 2011)
New Revision: 10338
Modified:
branches/Branch_2_2_EAP/docs/user-manual/en/ha.xml
branches/Branch_2_2_EAP/src/main/org/hornetq/jms/client/HornetQConnection.java
branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQRAManagedConnection.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java
Log:
https://issues.jboss.org/browse/HORNETQ-653
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/ha.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/ha.xml 2011-03-15 11:18:33 UTC (rev 10337)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/ha.xml 2011-03-15 11:38:30 UTC (rev 10338)
@@ -302,7 +302,37 @@
<para>Any ExceptionListener or SessionFailureListener instance will always be called by
HornetQ on event of connection failure, <emphasis role="bold"
>irrespective</emphasis> of whether the connection was successfully failed over,
- reconnected or reattached.</para>
+ reconnected or reattached, however you can find out if reconnect or reattach has happened
+ by either the <literal>failedOver</literal> flag passed in on the <literal>connectionFailed</literal>
+ on <literal>SessionfailureListener</literal> or by inspecting the error code on the
+ <literal>javax.jms.JMSException</literal> which will be one of the following:</para>
+ <table frame="topbot" border="2">
+ <title>JMSException error codes</title>
+ <tgroup cols="2">
+ <colspec colname="c1" colnum="1"/>
+ <colspec colname="c2" colnum="2"/>
+ <thead>
+ <row>
+ <entry>error code</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>FAILOVER</entry>
+ <entry>
+ Failover has occurred and we have successfully reattached or reconnected.
+ </entry>
+ </row>
+ <row>
+ <entry>DISCONNECT</entry>
+ <entry>
+ No failover has occurred and we are disconnected.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
</section>
<section>
<title>Application-Level Failover</title>
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/jms/client/HornetQConnection.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/jms/client/HornetQConnection.java 2011-03-15 11:18:33 UTC (rev 10337)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/jms/client/HornetQConnection.java 2011-03-15 11:38:30 UTC (rev 10338)
@@ -69,6 +69,10 @@
public static final int TYPE_TOPIC_CONNECTION = 2;
+ public static final String EXCEPTION_FAILOVER = "FAILOVER";
+
+ public static final String EXCEPTION_DISCONNECT = "DISCONNECT";
+
public static final SimpleString CONNECTION_ID_PROPERTY_NAME = new SimpleString("__HQ_CID");
// Static ---------------------------------------------------------------------------------------
@@ -628,7 +632,7 @@
HornetQConnection conn = connectionRef.get();
- if (conn != null && ! failedOver)
+ if (conn != null)
{
try
{
@@ -636,7 +640,7 @@
if (exceptionListener != null)
{
- final JMSException je = new JMSException(me.toString());
+ final JMSException je = new JMSException(me.toString(), failedOver?EXCEPTION_FAILOVER: EXCEPTION_DISCONNECT);
je.initCause(me);
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQRAManagedConnection.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQRAManagedConnection.java 2011-03-15 11:18:33 UTC (rev 10337)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQRAManagedConnection.java 2011-03-15 11:38:30 UTC (rev 10338)
@@ -51,6 +51,7 @@
import javax.transaction.xa.XAResource;
import org.hornetq.core.logging.Logger;
+import org.hornetq.jms.client.HornetQConnection;
/**
* The managed connection
@@ -555,6 +556,10 @@
*/
public void onException(final JMSException exception)
{
+ if(HornetQConnection.EXCEPTION_FAILOVER.equals(exception.getErrorCode()))
+ {
+ return;
+ }
if (HornetQRAManagedConnection.trace)
{
HornetQRAManagedConnection.log.trace("onException(" + exception + ")");
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2011-03-15 11:18:33 UTC (rev 10337)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2011-03-15 11:38:30 UTC (rev 10338)
@@ -262,6 +262,7 @@
fail("backup server never started");
}
}
+ System.out.println("sf.getBackupConnector() = " + sf.getBackupConnector());
}
protected void waitForBackup(long seconds)
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2011-03-15 11:18:33 UTC (rev 10337)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2011-03-15 11:38:30 UTC (rev 10338)
@@ -169,10 +169,10 @@
conn.close();
-// TODO - https://issues.jboss.org/browse/HORNETQ-653
-// Assert.assertNotNull(listener.e);
-//
-// Assert.assertTrue(me == listener.e.getCause());
+
+ Assert.assertNotNull(listener.e);
+
+ Assert.assertTrue(me == listener.e.getCause());
}
public void testReconnectSameNodeServerRestartedWithNonDurableSub() throws Exception
@@ -257,8 +257,7 @@
conn.close();
- // TODO - https://issues.jboss.org/browse/HORNETQ-653
- //Assert.assertNotNull(listener.e);
+ Assert.assertNotNull(listener.e);
}
//If the server is shutdown after a non durable sub is created, then close on the connection should proceed normally
13 years, 10 months
JBoss hornetq SVN: r10337 - branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-03-15 07:18:33 -0400 (Tue, 15 Mar 2011)
New Revision: 10337
Modified:
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java
Log:
test fix
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java 2011-03-15 11:06:24 UTC (rev 10336)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java 2011-03-15 11:18:33 UTC (rev 10337)
@@ -158,7 +158,7 @@
Assert.assertTrue(session.isXA());
Assert.assertTrue(session.isClosed());
- UnitTestCase.expectXAException(XAException.XAER_RMERR, new HornetQAction()
+ UnitTestCase.expectXAException(XAException.XA_RETRY, new HornetQAction()
{
public void run() throws XAException
{
13 years, 10 months