commit 053682b8cf73e1500c3c126d04be840bd7991226
author Yi Tseng <yi@opennetworking.org> Thu Nov 09 13:54:12 2017 -0800
committer Charles Chan <rascov@gmail.com> Fri Nov 10 12:35:14 2017 -0800
tree 9f4ac55955605776b754c4ef47c13d4e1747b75c
parent 5f1def8783a660171cc98fe73e3c598f9b5e9244

[CORD-2228] Fix concurrent error when reactivate DHCP relay

Change-Id: Iad23ca690661055be78eadccb4c6926e5f4ea892

apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java

diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
index d49b9a9..d0a8214 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
@@ -302,14 +302,13 @@
             newServerInfo.setDhcpConnectVlan(host.vlan());
             newServerInfo.setDhcpConnectMac(host.mac());
         }
-        // Add new server info
-        serverInfoList.add(0, newServerInfo);
 
-        // Remove duplicated server info
-        Set<DhcpServerInfo> nonDupServerInfoList = Sets.newLinkedHashSet();
-        nonDupServerInfoList.addAll(serverInfoList);
-        serverInfoList.clear();
-        serverInfoList.addAll(nonDupServerInfoList);
+        // Add new server info
+        synchronized (this) {
+            serverInfoList.clear();
+            serverInfoList.add(0, newServerInfo);
+        }
+
         requestDhcpPacket(serverIp);
     }
 

apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java

diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
index 7f35e82..dabd05b 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
@@ -1153,13 +1153,10 @@
             newServerInfo.setDhcpConnectMac(host.mac());
         }
         // Add new server info
-        serverInfoList.add(0, newServerInfo);
-
-        // Remove duplicated server info
-        Set<DhcpServerInfo> nonDupServerInfoList = Sets.newLinkedHashSet();
-        nonDupServerInfoList.addAll(serverInfoList);
-        serverInfoList.clear();
-        serverInfoList.addAll(nonDupServerInfoList);
+        synchronized (this) {
+            serverInfoList.clear();
+            serverInfoList.add(0, newServerInfo);
+        }
         requestDhcpPacket(serverIp);
     }