| commit | 11ba20f1d5d6355c46b53ef26bfd79739a25f950 | [log] [tgz] |
|---|---|---|
| author | Charles Chan <rascov@gmail.com> | Sat Dec 03 22:40:36 2016 -0800 |
| committer | Yuta HIGUCHI <y-higuchi@onlab.us> | Tue Dec 06 02:25:37 2016 +0000 |
| tree | 4cd317888c0f959819ecbda5dcb1e310b0bda458 | |
| parent | f241549c96d8d9eab739c2f7ce170174a9182f56 [diff] |
Fix NPE when clean up SingleSwitchFibInstaller interfaces can be null if no interface config is provided Change-Id: I67f94f78ef1fb4536e5bbc940be6216e2699f2fe (cherry picked from commit 14ed0b65f3d2316f5ec7c4a8ed56b88f1fe02d33)
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