| commit | 317a7de66f6d977dd9894a83ce857c0f732fd773 | [log] [tgz] |
|---|---|---|
| author | Konstantinos Kanonakis <kanonakisk@gmail.com> | Thu Feb 18 18:00:11 2016 -0600 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Fri Feb 19 21:12:01 2016 +0000 |
| tree | 333ea30844c2ab5dcc9db4e4b21c29a76e2b5635 | |
| parent | 762c1bb9717c94f73e56a9df6b3b2d48e249fd8b [diff] |
Fixed issue in MeterManager.java - Added check in pushMeterMetrics method to delete Meter only when it is in the PENDING_REMOVE state - Minor change: Corrected description in MeterId.java to indicate that MeterIds are unique only within a device Change-Id: I40e8a0cfaa93884b026e899e9c879e22133ba63b
diff --git a/core/api/src/main/java/org/onosproject/net/meter/MeterId.java b/core/api/src/main/java/org/onosproject/net/meter/MeterId.java index 872de2d..43c4141 100644 --- a/core/api/src/main/java/org/onosproject/net/meter/MeterId.java +++ b/core/api/src/main/java/org/onosproject/net/meter/MeterId.java
@@ -19,7 +19,7 @@ /** * A representation of a meter id. - * Uniquely identifies a meter system wide. + * Uniquely identifies a meter in the scope of a single device. */ public final class MeterId {
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java b/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java index 25ff4fe..e4315a1 100644 --- a/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java +++ b/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java
@@ -222,7 +222,7 @@ provider().performMeterOperation(m.deviceId(), new MeterOperation(m, MeterOperation.Type.ADD)); - } else { + } else if ((m.state() == MeterState.PENDING_REMOVE)) { store.deleteMeterNow(m); } });