From cb02183709b6ab970ebedab25660c3b9fa7ce04c Mon Sep 17 00:00:00 2001
From: hwchiu <sppsorrg@gmail.com>
Date: Sat, 1 Mar 2014 13:36:36 +0800
Subject: [PATCH] Add the condition check avoid NullException when user delete
a non-exist hosts
---
.../virtualnetwork/VirtualNetworkFilter.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/virtualnetwork/VirtualNetworkFilter.java b/src/main/java/net/floodlightcontroller/virtualnetwork/VirtualNetworkFilter.java
index ab48d2866..1d64144dc 100644
--- a/src/main/java/net/floodlightcontroller/virtualnetwork/VirtualNetworkFilter.java
+++ b/src/main/java/net/floodlightcontroller/virtualnetwork/VirtualNetworkFilter.java
@@ -250,9 +250,10 @@ public class VirtualNetworkFilter
if (mac == null && port == null) return;
if (port != null) {
MACAddress host = portToMac.remove(port);
- if(vNetsByGuid.get(macToGuid.get(host)) != null)
+ if(host !=null && vNetsByGuid.get(macToGuid.get(host)) != null)
vNetsByGuid.get(macToGuid.get(host)).removeHost(host);
- macToGuid.remove(host);
+ if(host !=null)
+ macToGuid.remove(host);
} else if (mac != null) {
if (!portToMac.isEmpty()) {
for (Entry<String, MACAddress> entry : portToMac.entrySet()) {
--
GitLab