commit 0f87d48190903398a2899715a0309acb18fcb102
author Ray Milkey <ray@onlab.us> Wed Jul 06 11:49:19 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Jul 07 00:02:30 2016 +0000
tree 24586880e0df99332c8c2b21798aa04095f37ab5
parent 709a17930df16e89654110a68666a8c49d947f3b

Fix NPE if synchronizer thread runs while the provider is shutting down.

Change-Id: I3024c4ff0315f60da1e3023449ac18080aa6e315

providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LldpLinkProvider.java

diff --git a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LldpLinkProvider.java b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LldpLinkProvider.java
index 16a6fc0..dca849e 100644
--- a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LldpLinkProvider.java
+++ b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LldpLinkProvider.java
@@ -374,7 +374,7 @@
      * Loads available devices and registers their ports to be probed.
      */
     private void loadDevices() {
-        if (!enabled) {
+        if (!enabled || deviceService == null) {
             return;
         }
         deviceService.getAvailableDevices()