MeterRequest may be null, if meterRequest is null, the implementation of meterService.withdraw(meterRequest, tmpMeter.id()) will cause an exception.
Change-Id: I2e2cec49c88521041c2cdf37e40644aa36c16862
diff --git a/web/api/src/main/java/org/onosproject/rest/resources/MetersWebResource.java b/web/api/src/main/java/org/onosproject/rest/resources/MetersWebResource.java
index 6fbe1b3..814b351 100644
--- a/web/api/src/main/java/org/onosproject/rest/resources/MetersWebResource.java
+++ b/web/api/src/main/java/org/onosproject/rest/resources/MetersWebResource.java
@@ -183,7 +183,11 @@
final Meter tmpMeter = meterService.getMeter(did, mid);
if (tmpMeter != null) {
final MeterRequest meterRequest = meterToMeterRequest(tmpMeter, "REMOVE");
- meterService.withdraw(meterRequest, tmpMeter.id());
+ if (meterRequest != null) {
+ meterService.withdraw(meterRequest, tmpMeter.id());
+ }
+ } else {
+ log.warn("Meter {}, is not present", tmpMeter);
}
return Response.noContent().build();
}