| commit | 14ed0b65f3d2316f5ec7c4a8ed56b88f1fe02d33 | [log] [tgz] |
|---|---|---|
| author | Charles Chan <rascov@gmail.com> | Sat Dec 03 22:40:36 2016 -0800 |
| committer | Jonathan Hart <jono@onlab.us> | Mon Dec 05 23:06:10 2016 +0000 |
| tree | d405c984baabdfb398af6436c209d4e1dd3f535a | |
| parent | db46ab39e724323a2614d63042f97d30b1827f05 [diff] |
Fix NPE when clean up SingleSwitchFibInstaller interfaces can be null if no interface config is provided Change-Id: I67f94f78ef1fb4536e5bbc940be6216e2699f2fe
diff --git a/apps/routing/src/main/java/org/onosproject/routing/impl/SingleSwitchFibInstaller.java b/apps/routing/src/main/java/org/onosproject/routing/impl/SingleSwitchFibInstaller.java index a295a14..dcdba8e 100644 --- a/apps/routing/src/main/java/org/onosproject/routing/impl/SingleSwitchFibInstaller.java +++ b/apps/routing/src/main/java/org/onosproject/routing/impl/SingleSwitchFibInstaller.java
@@ -282,7 +282,7 @@ private Set<Interface> getInterfaces() { Set<Interface> intfs; - if (interfaces.isEmpty()) { + if (interfaces == null || interfaces.isEmpty()) { intfs = interfaceService.getInterfaces(); } else { // TODO need to fix by making interface names globally unique