Author: gtully
Date: Fri Aug 6 17:05:59 2010
New Revision: 983057
URL: http://svn.apache.org/viewvc?rev=983057&view=rev
Log:
resolve https://issues.apache.org/activemq/browse/AMQ-2659 - allow
XAConnection/Session to be used without an XA transaction, defaults to auto_ack
mode. Can still be only used transactionally with an XA transaction
Added:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSXAConsumerTest.java
(with props)
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQXASession.java
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQXASession.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQXASession.java?rev=983057&r1=983056&r2=983057&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQXASession.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQXASession.java
Fri Aug 6 17:05:59 2010
@@ -69,7 +69,7 @@ public class ActiveMQXASession extends A
}
public boolean getTransacted() throws JMSException {
- return true;
+ return getTransactionContext().isInXATransaction();
}
public void rollback() throws JMSException {
@@ -96,19 +96,16 @@ public class ActiveMQXASession extends A
return new ActiveMQTopicSession(this);
}
- /**
- * This is called before transacted work is done by
- * the session. XA Work can only be done when this
- * XA resource is associated with an Xid.
- *
- * @throws JMSException not associated with an Xid
+ /*
+ * when there is no XA transaction it is auto ack
*/
+ public boolean isAutoAcknowledge() {
+ return true;
+ }
+
protected void doStartTransaction() throws JMSException {
-
- if (!getTransactionContext().isInXATransaction()) {
- throw new JMSException("Session's XAResource has not been enlisted
in a distributed transaction.");
- }
-
+ // allow non transactional auto ack work on an XASession
+ // Seems ok by the spec that an XAConnection can be used without an XA
tx
}
}
Added:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSXAConsumerTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSXAConsumerTest.java?rev=983057&view=auto
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSXAConsumerTest.java
(added)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSXAConsumerTest.java
Fri Aug 6 17:05:59 2010
@@ -0,0 +1,50 @@
+/**
+ * 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;
+
+import javax.jms.ConnectionFactory;
+import junit.framework.Test;
+
+/*
+ * allow an XA session to be used as an auto ack session when no XA transaction
+ * https://issues.apache.org/activemq/browse/AMQ-2659
+ */
+public class JMSXAConsumerTest extends JMSConsumerTest {
+
+ public static Test suite() {
+ return suite(JMSXAConsumerTest.class);
+ }
+
+ @Override
+ protected ConnectionFactory createConnectionFactory() throws Exception {
+ return new ActiveMQXAConnectionFactory("vm://localhost");
+ }
+
+ // some tests use transactions, these will not work unless an XA
transaction is in place
+ // slip these
+ public void testPrefetch1MessageNotDispatched() throws Exception {
+ }
+
+ public void testRedispatchOfUncommittedTx() throws Exception {
+ }
+
+ public void testRedispatchOfRolledbackTx() throws Exception {
+ }
+
+ public void
testMessageListenerOnMessageCloseUnackedWithPrefetch1StayInQueue() throws
Exception {
+ }
+}
Propchange:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSXAConsumerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSXAConsumerTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
