killbill-memoizeit

jaxrs: support empty strings for minDate Signed-off-by: …

1/3/2017 9:13:43 AM

Pierre-Alexandre Meyer <pierre@mouraf.org>

Pierre-Alexandre Meyer

Commit: ce364ca

Tree: 5f40dad

Parents: fe96799

Changes

jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AdminResource.java 2(+1 -1)

Details

jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AdminResource.java 2(+1 -1)

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AdminResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AdminResource.java
index c59412f..07b9306 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AdminResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AdminResource.java
@@ -161,7 +161,7 @@ public class AdminResource extends JaxRsResourceBase {
         final Long accountRecordId = Strings.isNullOrEmpty(accountIdStr) ? null : recordIdApi.getRecordId(UUID.fromString(accountIdStr), ObjectType.ACCOUNT, tenantContext);
 
         // Limit search results by default
-        final DateTime minDate = minDateOrNull != null ? DATE_TIME_FORMATTER.parseDateTime(minDateOrNull).toDateTime(DateTimeZone.UTC) : clock.getUTCNow().minusMonths(2);
+        final DateTime minDate = Strings.isNullOrEmpty(minDateOrNull) ? clock.getUTCNow().minusMonths(2) : DATE_TIME_FORMATTER.parseDateTime(minDateOrNull).toDateTime(DateTimeZone.UTC);
 
         final StreamingOutput json = new StreamingOutput() {
             @Override