This closes #2900

artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java

@@ -392,12 +392,18 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
 
             Transaction txToRollback = tx;
             if (txToRollback != null) {
+               if (txToRollback.getXid() != null) {
+                  resourceManager.removeTransaction(txToRollback.getXid());
+               }
                txToRollback.rollbackIfPossible();
             }
 
             txToRollback = pendingTX;
 
             if (txToRollback != null) {
+               if (txToRollback.getXid() != null) {
+                  resourceManager.removeTransaction(txToRollback.getXid());
+               }
                txToRollback.rollbackIfPossible();
             }
 

artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/ResourceManager.java

@@ -46,4 +46,6 @@ public interface ResourceManager extends ActiveMQComponent {
 
    List<Xid> getInDoubtTransactions();
 
+   int size();
+
 }

artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/ResourceManagerImpl.java

@@ -61,6 +61,11 @@ public class ResourceManagerImpl implements ResourceManager {
 
    // ActiveMQComponent implementation
 
+   @Override
+   public int size() {
+      return transactions.size();
+   }
+
    @Override
    public void start() throws Exception {
       if (started) {

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/SessionFailureXATest.java

@@ -167,6 +167,8 @@ public class SessionFailureXATest extends ActiveMQTestBase {
 
       Wait.assertEquals(0, () -> messagingService.getSessions().size());
 
+      Wait.assertEquals(0, messagingService.getResourceManager()::size);
+
       locator = createInVMNonHALocator();
       sessionFactory = createSessionFactory(locator);
       clientSession = addClientSession(sessionFactory.createSession(true, false, false));