Code Review
/
ovsdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug 6692: use non-deprecated firstKeyOf() variant
[ovsdb.git]
/
southbound
/
southbound-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
ovsdb
/
southbound
/
OvsdbConnectionManager.java
diff --git
a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java
b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java
index 55742e7cbe1d2570e5675918da847945f2218b8b..be0ab7e042d9ef6c1d09cc0371b522b788a421b4 100644
(file)
--- a/
southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java
+++ b/
southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java
@@
-314,10
+314,10
@@
public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
LogicalDatastoreType.OPERATIONAL, nodePath);
transaction.close();
Optional<Node> optional = nodeFuture.get();
LogicalDatastoreType.OPERATIONAL, nodePath);
transaction.close();
Optional<Node> optional = nodeFuture.get();
- if (optional
!= null && optional.isPresent() && optional.get() != null
) {
+ if (optional
.isPresent()
) {
return this.getConnectionInstance(optional.get());
} else {
return this.getConnectionInstance(optional.get());
} else {
- LOG.
warn("Found non-topological node {} on path {}",optional
);
+ LOG.
debug("Node was not found on the path in the operational DS: {}", nodePath
);
return null;
}
} catch (InterruptedException | ExecutionException e) {
return null;
}
} catch (InterruptedException | ExecutionException e) {