Stop failing discard-changes operation when tx wasn't initialized

[controller.git] / opendaylight / netconf / mdsal-netconf-connector / src / main / java / org / opendaylight / controller / netconf / mdsal / connector / TransactionProvider.java

diff --git a/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/controller/netconf/mdsal/connector/TransactionProvider.java b/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/controller/netconf/mdsal/connector/TransactionProvider.java
index f1b214b83e712f5997e443f4f9759f0bbb31a310..86e65abbbe6f232396ba786de230473c57977b63 100644 (file)
--- a/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/controller/netconf/mdsal/connector/TransactionProvider.java
+++ b/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/controller/netconf/mdsal/connector/TransactionProvider.java
@@ -94,7 +94,10 @@ public class TransactionProvider implements AutoCloseable{
     public synchronized void abortTransaction() {
         LOG.debug("Aborting current candidateTransaction");
         Optional<DOMDataReadWriteTransaction> otx = getCandidateTransaction();
-        Preconditions.checkState(otx.isPresent(), NO_TRANSACTION_FOUND_FOR_SESSION + netconfSessionIdForReporting);
+        if (!otx.isPresent()) {
+            LOG.warn("discard-changes triggerd on an empty transaction for session: {}", netconfSessionIdForReporting );
+            return;
+        }
         candidateTransaction.cancel();
         allOpenReadWriteTransactions.remove(candidateTransaction);
         candidateTransaction = null;