X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fnetconf%2Fmdsal-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fmdsal%2Fconnector%2Fops%2FDiscardChanges.java;h=ce4de18ee6b5ef5554232d566d8259cba251eca5;hb=a54ec60368110d22794602343c934902f6833c65;hp=36f6d8e3cf56c5866225f467fea7ea7c1612c3dc;hpb=b5e3b3f436f8534ddb6c7f326ccbef995b96ddc3;p=controller.git diff --git a/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/controller/netconf/mdsal/connector/ops/DiscardChanges.java b/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/controller/netconf/mdsal/connector/ops/DiscardChanges.java index 36f6d8e3cf..ce4de18ee6 100644 --- a/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/controller/netconf/mdsal/connector/ops/DiscardChanges.java +++ b/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/controller/netconf/mdsal/connector/ops/DiscardChanges.java @@ -17,7 +17,7 @@ import org.opendaylight.controller.netconf.api.NetconfDocumentedException.ErrorT import org.opendaylight.controller.netconf.api.NetconfDocumentedException.ErrorType; import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.controller.netconf.mdsal.connector.TransactionProvider; -import org.opendaylight.controller.netconf.util.mapping.AbstractLastNetconfOperation; +import org.opendaylight.controller.netconf.util.mapping.AbstractSingletonNetconfOperation; import org.opendaylight.controller.netconf.util.xml.XmlElement; import org.opendaylight.controller.netconf.util.xml.XmlUtil; import org.slf4j.Logger; @@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; -public class DiscardChanges extends AbstractLastNetconfOperation{ +public class DiscardChanges extends AbstractSingletonNetconfOperation { private static final Logger LOG = LoggerFactory.getLogger(DiscardChanges.class); @@ -40,7 +40,6 @@ public class DiscardChanges extends AbstractLastNetconfOperation{ @Override protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) throws NetconfDocumentedException { - operationElement.getOnlyChildElement(OPERATION_NAME); try { transactionProvider.abortTransaction(); @@ -60,4 +59,5 @@ public class DiscardChanges extends AbstractLastNetconfOperation{ protected String getOperationName() { return OPERATION_NAME; } + }