Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-1792: share QNames in both cases
[controller.git]
/
opendaylight
/
md-sal
/
sal-netconf-connector
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
connect
/
netconf
/
listener
/
NetconfSessionCapabilities.java
diff --git
a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/listener/NetconfSessionCapabilities.java
b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/listener/NetconfSessionCapabilities.java
index 0999efff0f6aed20bba510d2de207e316166c3df..2642116927cde25de425d8de95884cb5d0ae3b57 100644
(file)
--- a/
opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/listener/NetconfSessionCapabilities.java
+++ b/
opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/listener/NetconfSessionCapabilities.java
@@
-119,6
+119,10
@@
public final class NetconfSessionCapabilities {
return fromStrings(session.getServerCapabilities());
}
return fromStrings(session.getServerCapabilities());
}
+ private static final QName cachedQName(String namespace, String revision, String moduleName) {
+ return QName.cachedReference(QName.create(namespace, revision, moduleName));
+ }
+
public static NetconfSessionCapabilities fromStrings(final Collection<String> capabilities) {
final Set<QName> moduleBasedCaps = new HashSet<>();
final Set<String> nonModuleCaps = Sets.newHashSet(capabilities);
public static NetconfSessionCapabilities fromStrings(final Collection<String> capabilities) {
final Set<QName> moduleBasedCaps = new HashSet<>();
final Set<String> nonModuleCaps = Sets.newHashSet(capabilities);
@@
-138,7
+142,7
@@
public final class NetconfSessionCapabilities {
String revision = REVISION_PARAM.from(queryParams);
if (revision != null) {
String revision = REVISION_PARAM.from(queryParams);
if (revision != null) {
- moduleBasedCaps.add(
QName.creat
e(namespace, revision, moduleName));
+ moduleBasedCaps.add(
cachedQNam
e(namespace, revision, moduleName));
nonModuleCaps.remove(capability);
continue;
}
nonModuleCaps.remove(capability);
continue;
}
@@
-158,7
+162,7
@@
public final class NetconfSessionCapabilities {
}
// FIXME: do we really want to continue here?
}
// FIXME: do we really want to continue here?
- moduleBasedCaps.add(
QName.cachedReference(QName.create(namespace, revision, moduleName)
));
+ moduleBasedCaps.add(
cachedQName(namespace, revision, moduleName
));
nonModuleCaps.remove(capability);
}
nonModuleCaps.remove(capability);
}