added some null checks for device instance
Change-Id: I84ab4365513a61bac4a5e852c8589fae3c828710
diff --git a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDevice.java b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDevice.java
index 440c045..b3d26b0 100644
--- a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDevice.java
+++ b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDevice.java
@@ -164,7 +164,9 @@
+ deviceInfo(), e);
} finally {
log.debug("Closing the session after successful execution");
- ssh.close();
+ if (ssh != null) {
+ ssh.close();
+ }
}
}
diff --git a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
index 9a8c1bd..f9194a7 100644
--- a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
+++ b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
@@ -339,7 +339,7 @@
+ device.deviceInfo(), e);
} catch (Exception e) {
log.error("Error while initializing session for the device: "
- + device.deviceInfo(), e);
+ + (device != null ? device.deviceInfo() : null), e);
}
}
diff --git a/providers/netconf/device/src/test/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProviderTest.java b/providers/netconf/device/src/test/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProviderTest.java
index 276cf10..3e24ac9 100644
--- a/providers/netconf/device/src/test/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProviderTest.java
+++ b/providers/netconf/device/src/test/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProviderTest.java
@@ -378,7 +378,7 @@
throw e;
} catch (Exception e) {
log.error("Error while initializing session for the device: "
- + device.deviceInfo(), e);
+ + (device != null ? device.deviceInfo() : null), e);
}
}