From: Jakub Morvay <jmorvay@frinx.io>
Date: Thu, 17 Jan 2019 14:19:32 +0000 (+0100)
Subject: Fix NetconfKeystoreAdapter onDataTreeChanged method
X-Git-Tag: release/neon~27^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=netconf.git;a=commitdiff_plain;h=ded048d530e879ff454d374608142541ab21121e

Fix NetconfKeystoreAdapter onDataTreeChanged method

Make sure to process all incoming DataObject modifications under
netconf-keystore:keystore container. Do not stop after handling
key-credential list items, handle also modified private-key and
trusted-certificate list items.

JIRA: NETCONF-598
Change-Id: I7e56791c46bd860f98259f73f2832e49abc2e3dc
Signed-off-by: Jakub Morvay <jmorvay@frinx.io>
---

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfKeystoreAdapter.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfKeystoreAdapter.java
index f9cd899092..b1d707f708 100644
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfKeystoreAdapter.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfKeystoreAdapter.java
@@ -159,7 +159,6 @@ public class NetconfKeystoreAdapter implements ClusteredDataTreeChangeListener<K
                     if (dataAfter != null) {
                         dataAfter.getKeyCredential().forEach(pair -> pairs.put(pair.key().getKeyId(), pair));
                     }
-                    break;
 
                 } else if (changedChild.getDataType().equals(PrivateKey.class)) {
                     onPrivateKeyChanged((DataObjectModification<PrivateKey>)changedChild);