killbill-uncached

Add check on start/end date for usage resource

9/27/2014 2:58:45 PM

stephane brossier

Commit: ec769c5

Tree: 83fa1a0

Parents: 7a71ebf

Changes

jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/UsageResource.java 6(+6 -0)

Details

jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/UsageResource.java 6(+6 -0)

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/UsageResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/UsageResource.java
index f053d3d..048cae1 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/UsageResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/UsageResource.java
@@ -122,6 +122,9 @@ public class UsageResource extends JaxRsResourceBase {
                              @QueryParam(QUERY_END_DATE) final String endDate,
                              @javax.ws.rs.core.Context final HttpServletRequest request)  {
 
+        if (startDate == null || endDate == null) {
+            return Response.status(Status.BAD_REQUEST).build();
+        }
         final TenantContext tenantContext = context.createContext(request);
 
         final LocalDate usageStartDate = LOCAL_DATE_FORMATTER.parseLocalDate(startDate);
@@ -141,6 +144,9 @@ public class UsageResource extends JaxRsResourceBase {
                              @QueryParam(QUERY_END_DATE) final String endDate,
                              @javax.ws.rs.core.Context final HttpServletRequest request)  {
 
+        if (startDate == null || endDate == null) {
+            return Response.status(Status.BAD_REQUEST).build();
+        }
         final TenantContext tenantContext = context.createContext(request);
 
         final LocalDate usageStartDate = LOCAL_DATE_FORMATTER.parseLocalDate(startDate);