Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added a test case to try reproduce bug AMQ-1054 (unfortunately it doesnt) - also added a patch to try fix AMQ-1054 based on the kind suggestion from Shoaib Akhtar that it could be the cast from getData() causing the ClassCastException; so AMQ-1054 may be fixed but as yet we don't have a test case to prove it 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@479726 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Strachan 2006-11-27 19:01:37 +00:00
parent 4f7aeecc1e
commit 935fde0377
4 changed files with 184 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
activemq-core/src/main/java/org/apache/activemq/TransactionContext.java
View File

@ -35,6 +35,7 @@ import org.apache.activemq.command.LocalTransactionId;
import org.apache.activemq.command.TransactionId;
import org.apache.activemq.command.TransactionInfo;
import org.apache.activemq.command.XATransactionId;
import org.apache.activemq.command.DataStructure;
import org.apache.activemq.transaction.Synchronization;
import org.apache.activemq.util.JMSExceptionSupport;
import org.apache.activemq.util.LongSequenceGenerator;
@ -514,7 +515,16 @@ public class TransactionContext implements XAResource {
this.connection.ensureConnectionInfoSent();
DataArrayResponse receipt = (DataArrayResponse) this.connection.syncSendPacket(info);
return (XATransactionId[]) receipt.getData();
DataStructure[] data = receipt.getData();
XATransactionId[] answer = null;
if (data instanceof XATransactionId[]) {
answer = (XATransactionId[]) data;
}
else {
answer = new XATransactionId[data.length];
System.arraycopy(data, 0, answer, 0, data.length);
}
return answer;
} catch (JMSException e) {
throw toXAException(e);
}

101
activemq-test-atomikos/pom.xml Executable file
View File

@ -0,0 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
<version>4.2-incubator-SNAPSHOT</version>
</parent>
<artifactId>activemq-test-atomikos</artifactId>
<packaging>jar</packaging>
<name>ActiveMQ :: Atomikos System Test</name>
<repositories>
<!-- for the Atomikos jars -->
<repository>
<id>logicblaze.deps</id>
<url>http://repo.logicblaze.com/maven2-all</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
<dependencies>
<!-- activemq -->
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-core</artifactId>
<scope>compile</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activeio-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.atomikos</groupId>
<artifactId>transactions</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>com.atomikos</groupId>
<artifactId>transactions-api</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>com.atomikos</groupId>
<artifactId>transactions-jta</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>com.atomikos</groupId>
<artifactId>atomikos-util</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

66
activemq-test-atomikos/src/test/java/org/apache/activemq/atomikos/XATest.java Normal file
View File

@ -0,0 +1,66 @@
/**
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.atomikos;
import com.atomikos.datasource.xa.DefaultXidFactory;
import org.apache.activemq.ActiveMQXAConnectionFactory;
import org.apache.activemq.command.ActiveMQQueue;
import javax.jms.MessageConsumer;
import javax.jms.XAConnection;
import javax.jms.XASession;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
import junit.framework.TestCase;
/**
* @version $Revision$
*/
public class XATest extends TestCase {
public void testXA() throws Exception {
//String url = "tcp://localhost:61616";
String url = "vm://localhost";
String qName = "MyQueue";
int timeout = 5;
DefaultXidFactory xidFactory = new DefaultXidFactory();
ActiveMQXAConnectionFactory xacf = new ActiveMQXAConnectionFactory();
xacf.setBrokerURL(url);
ActiveMQQueue queue = new ActiveMQQueue();
queue.setPhysicalName(qName);
XAConnection xaconn = xacf.createXAConnection();
xaconn.start();
XASession session = xaconn.createXASession();
XAResource xares = session.getXAResource();
MessageConsumer receiver = session.getSession().createConsumer(queue);
xares.recover(XAResource.TMSTARTRSCAN);
xares.recover(XAResource.TMNOFLAGS);
xares.setTransactionTimeout(timeout);
xares.isSameRM(xares);
Xid xid = xidFactory.createXid("part1", "part2");
xares.start(xid, XAResource.TMNOFLAGS);
receiver.receive(timeout);
xares.end(xid, XAResource.TMSUCCESS);
xares.rollback(xid);
System.out.println("Done!");
}
}

11
pom.xml
View File

@ -126,20 +126,21 @@
</distributionManagement>
<modules>
<module>activemq-jaas</module>
<module>activemq-core</module>
<module>activemq-console</module>
<module>activemq-jaas</module>
<module>activemq-jpa-store</module>
<module>activemq-openwire-generator</module>
<module>activemq-optional</module>
<module>activemq-ra</module>
<module>activemq-rar</module>
<module>activemq-test-atomikos</module>
<module>activemq-tooling</module>
<module>activemq-web</module>
<module>activemq-web-demo</module>
<module>activemq-web-console</module>
<module>activemq-optional</module>
<module>activemq-tooling</module>
<module>activemq-openwire-generator</module>
<module>activemq-xmpp</module>
<module>assembly</module>
<module>activemq-jpa-store</module>
</modules>
<scm>