BUG-5903: do not rely on primary info on failure

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / TransactionChainProxy.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxy.java
index b93f540f20783b74288b7112056883d6a535c9cf..6cfc7e1f05ff78208de740994c7b370487d2d752 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxy.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxy.java
@@ -151,10 +151,6 @@ final class TransactionChainProxy extends AbstractTransactionContextFactory<Loca
         this.parent = parent;
     }
 
-    public String getTransactionChainId() {
-        return getHistoryId().toString();
-    }
-
     @Override
     public DOMStoreReadTransaction newReadOnlyTransaction() {
         currentState.checkReady();
@@ -184,9 +180,9 @@ final class TransactionChainProxy extends AbstractTransactionContextFactory<Loca
         getActorContext().broadcast(new Function<Short, Object>() {
             @Override
             public Object apply(Short version) {
-                return new CloseTransactionChain(getHistoryId().toString(), version).toSerializable();
+                return new CloseTransactionChain(getHistoryId(), version).toSerializable();
             }
-        });
+        }, CloseTransactionChain.class);
     }
 
     private TransactionProxy allocateWriteTransaction(final TransactionType type) {
@@ -229,7 +225,7 @@ final class TransactionChainProxy extends AbstractTransactionContextFactory<Loca
             LOG.debug("Tx: {} - waiting for ready futures with pending Tx {}", txId, previousTransactionId);
         } else {
             previousTransactionId = "";
-            LOG.debug("Waiting for ready futures on chain {}", getTransactionChainId());
+            LOG.debug("Waiting for ready futures on chain {}", getHistoryId());
         }
 
         previous = combineFutureWithPossiblePriorReadOnlyTxFutures(previous, txId);