From b8f8ebecd3a5f563a21eea11e21ae1b6eb4b2757 Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Fri, 20 Feb 2015 15:13:03 +0100 Subject: [PATCH] Serialize capabilities for notification properly Added and removed capabilities in capabilities change notification were serialized as QName.toString but should be na Uri Change-Id: Id9783c060ecf45d3a7f506cf605051c779a6d21a Signed-off-by: Maros Marsalek --- .../controller/sal/connect/netconf/NotificationHandler.java | 3 ++- .../netconf/confignetconfconnector/osgi/YangStoreService.java | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NotificationHandler.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NotificationHandler.java index d340e4c1ad..bc3326e1ae 100644 --- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NotificationHandler.java +++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NotificationHandler.java @@ -63,7 +63,7 @@ final class NotificationHandler { private CompositeNode transformNotification(final NetconfMessage cachedNotification) { final CompositeNode parsedNotification = messageTransformer.toNotification(cachedNotification); - Preconditions.checkNotNull(parsedNotification, "{}: Unable to parse received notification %s", id, cachedNotification); + Preconditions.checkNotNull(parsedNotification, "%s: Unable to parse received notification: %s", id, cachedNotification); return parsedNotification; } @@ -91,6 +91,7 @@ final class NotificationHandler { } synchronized void onRemoteSchemaDown() { + queue.clear(); passNotifications = false; } diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/YangStoreService.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/YangStoreService.java index 60b8b8f468..176800fb97 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/YangStoreService.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/YangStoreService.java @@ -191,8 +191,7 @@ public class YangStoreService implements YangStoreContext { private static final Function MODULE_TO_URI = new Function() { @Override public Uri apply(final Module input) { - final QName qName = QName.cachedReference(QName.create(input.getQNameModule(), input.getName())); - return new Uri(qName.toString()); + return new Uri(new NetconfOperationServiceFactoryImpl.YangStoreCapability(input, input.getSource()).getCapabilityUri()); } }; -- 2.36.6