commit | 362bd8b641b7eb63d126cecf596478c687d9a121 | [log] [tgz] |
---|---|---|
author | Jian Li <pyguni@gmail.com> | Fri Jun 11 14:47:57 2021 +0900 |
committer | Jian Li <pyguni@gmail.com> | Mon Jun 14 01:45:57 2021 +0000 |
tree | f8777da1e4e2db5d1fdb525ab451e56c252383c2 | |
parent | de23826ba8a2af5c69f7f1cefec33c1280aa5f3f [diff] |
Fix: resolve a set of NPE at kubevirt networking Change-Id: I9ff05b3def4b60614a012ae2b9b97eb2b77e1d67 (cherry picked from commit 5f0b38a6eab3b4c5bffc09f23bb78fcdf641281c)
diff --git a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/NetworkAttachmentDefinitionWatcher.java b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/NetworkAttachmentDefinitionWatcher.java index d3a8ee4..eff1ca4 100644 --- a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/NetworkAttachmentDefinitionWatcher.java +++ b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/NetworkAttachmentDefinitionWatcher.java
@@ -258,7 +258,9 @@ log.trace("Process NetworkAttachmentDefinition {} removal event from API server.", name); - adminService.removeNetwork(name); + if (adminService.network(name) != null) { + adminService.removeNetwork(name); + } } private boolean isMaster() {