Code Review
/
openflowplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Revert "Fix statistics race condition on big flows"
[openflowplugin.git]
/
openflowplugin-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
openflowplugin
/
impl
/
registry
/
group
/
DeviceGroupRegistryImpl.java
diff --git
a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/group/DeviceGroupRegistryImpl.java
b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/group/DeviceGroupRegistryImpl.java
index 1154f56bb3101de33debe247f963b892f93e19cf..1698929974f1474a0c248be6a816618aa15ded7f 100644
(file)
--- a/
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/group/DeviceGroupRegistryImpl.java
+++ b/
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/group/DeviceGroupRegistryImpl.java
@@
-33,7
+33,24
@@
public class DeviceGroupRegistryImpl implements DeviceGroupRegistry {
@Override
public void removeMarked() {
@Override
public void removeMarked() {
- groupIdList.removeAll(marks);
+ synchronized (groupIdList) {
+ groupIdList.removeAll(marks);
+ }
marks.clear();
}
marks.clear();
}
+
+ @Override
+ public List<GroupId> getAllGroupIds() {
+ return groupIdList;
+ }
+
+ @Override
+ public void close() {
+ synchronized (groupIdList) {
+ groupIdList.clear();
+ }
+ synchronized (marks) {
+ marks.clear();
+ }
+ }
}
}