commit 0ae31468d339df9a8981962185573e166dc0df06
author 柯志勇10068695 <ke.zhiyong@zte.com.cn> Tue Oct 23 11:50:40 2018 +0800
committer Andrea Campanella <andrea@opennetworking.org> Wed Oct 24 09:55:48 2018 +0000
tree b26da8c5ba5cb5a7da072efcdfdcd35808deec61
parent bd0b1f1cdcf2ab037a69fce2e6c212e6d4b55cbf

MeterRequest may be null, if meterRequest is null, the implementation of meterService.withdraw(meterRequest, tmpMeter.id()) will cause an exception.

Change-Id: I2e2cec49c88521041c2cdf37e40644aa36c16862

web/api/src/main/java/org/onosproject/rest/resources/MetersWebResource.java

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();
     }