Fix various small warnings

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / registry / meter / DeviceMeterRegistryImpl.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/meter/DeviceMeterRegistryImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/meter/DeviceMeterRegistryImpl.java
index 584ea5fe5de879636a3ca423fb1f227e663a25d6..4d15fe3b86b3fcc3327c7f44413c47516e90dfaf 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/meter/DeviceMeterRegistryImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/meter/DeviceMeterRegistryImpl.java
@@ -8,7 +8,6 @@
 
 package org.opendaylight.openflowplugin.impl.registry.meter;
 
-import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
 import java.util.List;
 import org.opendaylight.openflowplugin.api.openflow.registry.meter.DeviceMeterRegistry;
@@ -19,8 +18,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.Meter
  */
 public class DeviceMeterRegistryImpl implements DeviceMeterRegistry {
 
-    private final List<MeterId> meterIds = new ArrayList();
-    private final List<MeterId> marks = new ArrayList();
+    private final List<MeterId> meterIds = new ArrayList<>();
+    private final List<MeterId> marks = new ArrayList<>();
 
     @Override
     public void store(final MeterId meterId) {
@@ -34,18 +33,26 @@ public class DeviceMeterRegistryImpl implements DeviceMeterRegistry {
 
     @Override
     public void removeMarked() {
-        meterIds.removeAll(marks);
-        marks.clear();
+        synchronized (meterIds) {
+            meterIds.removeAll(marks);
+        }
+        synchronized (marks) {
+            marks.clear();
+        }
     }
 
     @Override
     public List<MeterId> getAllMeterIds() {
-        return ImmutableList.copyOf(meterIds);
+        return meterIds;
     }
 
     @Override
     public void close() throws Exception {
-        meterIds.clear();
-        marks.clear();
+        synchronized (meterIds) {
+            meterIds.clear();
+        }
+        synchronized (marks) {
+            marks.clear();
+        }
     }
 }