From 6ab8cf484c83d20a7744543683938c1bc7764c5e Mon Sep 17 00:00:00 2001 From: Tomas Cere Date: Thu, 8 Oct 2015 11:58:38 +0200 Subject: [PATCH] Stop failing discard-changes operation when tx wasn't initialized Change-Id: Iece3fb47922d441ec863455f9d1981c58190f76e Signed-off-by: Tomas Cere --- .../netconf/mdsal/connector/TransactionProvider.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 f1b214b83e..86e65abbbe 100644 --- 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 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; -- 2.36.6