mirror of https://github.com/apache/activemq.git
resolve https://issues.apache.org/activemq/browse/AMQ-2670 - revert XA connection manager, using out of band recovery via JMS api is a workaround for jboss pending RAR based auto recovery or enlistment, comments in the jira with the relevant config
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@929145 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
99d51265ff
commit
2dd5b7737b
|
@ -128,12 +128,18 @@ public class TransactionBroker extends BrokerFilter {
|
|||
for (Iterator<Transaction> iter = xaTransactions.values().iterator(); iter.hasNext();) {
|
||||
Transaction tx = iter.next();
|
||||
if (tx.isPrepared()) {
|
||||
if (LOG.isDebugEnabled()) {
|
||||
LOG.debug("prepared transaction: " + tx.getTransactionId());
|
||||
}
|
||||
txs.add(tx.getTransactionId());
|
||||
}
|
||||
}
|
||||
}
|
||||
XATransactionId rc[] = new XATransactionId[txs.size()];
|
||||
txs.toArray(rc);
|
||||
if (LOG.isDebugEnabled()) {
|
||||
LOG.debug("prepared transacton list size: " + rc.length);
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,65 +0,0 @@
|
|||
/**
|
||||
* 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.ra;
|
||||
|
||||
import javax.resource.ResourceException;
|
||||
import javax.resource.spi.ConnectionManager;
|
||||
|
||||
import org.apache.activemq.ActiveMQXAConnectionFactory;
|
||||
|
||||
/**
|
||||
* Impl that will create an XAConnectionFactory that allows
|
||||
* org.jboss.jms.server.recovery.MessagingXAResourceRecovery to deal with recovery via jms apis
|
||||
* on the connectionfactory registered in jndi
|
||||
* to use, reference in the ra.xml as follows:
|
||||
* {@code <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQXAManagedConnectionFactory</managedconnectionfactory-class>}
|
||||
*
|
||||
*/
|
||||
public class ActiveMQXAManagedConnectionFactory extends ActiveMQManagedConnectionFactory {
|
||||
|
||||
private static final long serialVersionUID = 2032273395660212918L;
|
||||
|
||||
/**
|
||||
* This method returns an ActiveMQXAConnectonFactory<br/>
|
||||
*
|
||||
* @see javax.resource.spi.ManagedConnectionFactory#createConnectionFactory(javax.resource.spi.ConnectionManager)
|
||||
*/
|
||||
@Override
|
||||
public Object createConnectionFactory(ConnectionManager manager) throws ResourceException {
|
||||
return new ActiveMQXAConnectionFactory( getInfo().getUserName(), getInfo().getPassword(), getInfo().getServerUrl());
|
||||
}
|
||||
|
||||
/**
|
||||
* @see java.lang.Object#equals(java.lang.Object)
|
||||
*/
|
||||
@Override
|
||||
public boolean equals(Object object) {
|
||||
if (object == null || object.getClass() != ActiveMQXAManagedConnectionFactory.class) {
|
||||
return false;
|
||||
}
|
||||
return ((ActiveMQXAManagedConnectionFactory)object).getInfo().equals(getInfo());
|
||||
}
|
||||
|
||||
/**
|
||||
* @see java.lang.Object#hashCode()
|
||||
*/
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return getInfo().hashCode();
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue