Merge "Fix bug in persister causing to persist last configuration in a loop."

diff --git a/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPersisterNotificationHandler.java b/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPersisterNotificationHandler.java
index a777ea4099e5bf2595f57b512618551c4c4d2d68..ac6b5b28fd697fdf1290f3e5d8df2a6717834429 100644 (file)
--- a/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPersisterNotificationHandler.java
+++ b/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPersisterNotificationHandler.java
@@ -109,6 +109,7 @@ public class ConfigPersisterNotificationHandler implements NotificationListener,
                 logger.trace("Pushing following xml to netconf {}", configSnapshot);
                 try {
                     pushLastConfig(XmlUtil.readXmlToElement(configSnapshot));
+                    return;
                 } catch(ConflictingVersionException e) {
                     closeClientAndDispatcher(netconfClient, netconfClientDispatcher);
                     lastException = e;