commit 3069c61165c868f2cfa7afc4f22d35c3bfaa1839
author Yi Tseng <a86487817@gmail.com> Fri May 26 17:09:43 2017 -0700
committer Yi Tseng <a86487817@gmail.com> Fri May 26 18:53:11 2017 -0700
tree 84227e9e7598a273bfc87da98d3a9a08f2dd9b0c
parent 356d1250def0f1f23eb6af282fa8aca91c24c62f

[ONOS-6528] Avoid VPLS race condition problem

Change-Id: I2d1ce9a20e76eabf9489e3361dbf95e518294b6d

apps/vpls/src/main/java/org/onosproject/vpls/store/DistributedVplsStore.java

diff --git a/apps/vpls/src/main/java/org/onosproject/vpls/store/DistributedVplsStore.java b/apps/vpls/src/main/java/org/onosproject/vpls/store/DistributedVplsStore.java
index 6b50508..e2c4956 100644
--- a/apps/vpls/src/main/java/org/onosproject/vpls/store/DistributedVplsStore.java
+++ b/apps/vpls/src/main/java/org/onosproject/vpls/store/DistributedVplsStore.java
@@ -217,6 +217,10 @@
                     }
                     break;
                 case REMOVE:
+                    if (vplsData == null) {
+                        vplsData = VplsData.of(event.key());
+                    }
+                    vplsData.state(VplsData.VplsState.REMOVING);
                     VplsStoreEvent vplsStoreEvent =
                             new VplsStoreEvent(VplsStoreEvent.Type.REMOVE, vplsData);
                     notifyDelegate(vplsStoreEvent);