BUG-5280: fix problems identified by integration tests

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / databroker / actors / dds / ClientLocalHistory.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientLocalHistory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientLocalHistory.java
index b6c274628c752f19aa3728bb6e77996051e12240..ac1872835ac37a612acdd0e9401c57c17f789c6a 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientLocalHistory.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientLocalHistory.java
@@ -48,6 +48,16 @@ public final class ClientLocalHistory extends AbstractClientHistory implements A
         return new ClientTransaction(this, new TransactionIdentifier(getIdentifier(), nextTx()));
     }
 
+    @Override
+    void onTransactionAbort(final TransactionIdentifier txId) {
+        final State local = state();
+        if (local == State.TX_OPEN) {
+            updateState(local, State.IDLE);
+        }
+
+        super.onTransactionAbort(txId);
+    }
+
     @Override
     AbstractTransactionCommitCohort onTransactionReady(final TransactionIdentifier txId,
             final AbstractTransactionCommitCohort cohort) {