Skip to content
Snippets Groups Projects
Commit 9ab51c36 authored by Diogo's avatar Diogo
Browse files

Fix bug where it was impossible to remove member or pool if class above (pool...

Fix bug where it was impossible to remove member or pool if class above (pool for members and vip for pools)  was removed before.
parent 78b56f52
No related branches found
No related tags found
No related merge requests found
...@@ -687,7 +687,7 @@ public class LoadBalancer implements IFloodlightModule, ...@@ -687,7 +687,7 @@ public class LoadBalancer implements IFloodlightModule,
pool = pools.get(poolId); pool = pools.get(poolId);
if (pool == null) // fix dereference violations if (pool == null) // fix dereference violations
return -1; return -1;
if (pool.vipId != null) if (pool.vipId != null && vips.containsKey(pool.vipId))
vips.get(pool.vipId).pools.remove(poolId); vips.get(pool.vipId).pools.remove(poolId);
pools.remove(poolId); pools.remove(poolId);
return 0; return 0;
...@@ -750,7 +750,7 @@ public class LoadBalancer implements IFloodlightModule, ...@@ -750,7 +750,7 @@ public class LoadBalancer implements IFloodlightModule,
member = members.get(memberId); member = members.get(memberId);
if(member != null){ if(member != null){
if (member.poolId != null) if (member.poolId != null && pools.containsKey(member.poolId))
pools.get(member.poolId).members.remove(memberId); pools.get(member.poolId).members.remove(memberId);
members.remove(memberId); members.remove(memberId);
return 0; return 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment