홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
Committed by Gerrit Code Review
0f87d481 1 parent 709a1793

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

Change-Id: I3024c4ff0315f60da1e3023449ac18080aa6e315
Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
...@@ -374,7 +374,7 @@ public class LldpLinkProvider extends AbstractProvider implements ProbedLinkProv ...@@ -374,7 +374,7 @@ public class LldpLinkProvider extends AbstractProvider implements ProbedLinkProv
374 * Loads available devices and registers their ports to be probed. 374 * Loads available devices and registers their ports to be probed.
375 */ 375 */
376 private void loadDevices() { 376 private void loadDevices() {
377 - if (!enabled) { 377 + if (!enabled || deviceService == null) {
378 return; 378 return;
379 } 379 }
380 deviceService.getAvailableDevices() 380 deviceService.getAvailableDevices()
......