| commit | 6800ced6703808513582735f8ba3d61b504add85 | [log] [tgz] |
|---|---|---|
| author | Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> | Mon Nov 20 11:15:37 2017 -0800 |
| committer | Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> | Mon Nov 20 11:16:10 2017 -0800 |
| tree | eaee83d9ec906b8b71a331261069fdaaa3083659 | |
| parent | a031a26681fc43f1deb9f3c934f3e0063cfb64d7 [diff] [blame] |
various bug fixes Change-Id: Id77096bd4ee2160428619b475840b36fdb5f156c
diff --git a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfControllerImpl.java b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfControllerImpl.java index 0728bd9..2c885e0 100644 --- a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfControllerImpl.java +++ b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfControllerImpl.java
@@ -351,7 +351,7 @@ @Override public NetconfDevice createNetconfDevice(NetconfDeviceInfo netconfDeviceInfo) throws NetconfException { - if (NetconfSshClientLib.ETHZ_SSH2.equals(netconfDeviceInfo.sshClientLib()) || + if (NetconfSshClientLib.ETHZ_SSH2.equals(netconfDeviceInfo.sshClientLib().orElse(null)) || NetconfSshClientLib.ETHZ_SSH2.equals(sshLibrary)) { log.info("Creating NETCONF session to {} with {}", netconfDeviceInfo.name(), NetconfSshClientLib.ETHZ_SSH2);