From f5cae4743e2772e1ca001e2332d0613790e4470a Mon Sep 17 00:00:00 2001 From: Athou Date: Fri, 24 May 2013 11:48:20 +0200 Subject: [PATCH] return null when refresh is planned --- src/main/java/com/commafeed/frontend/model/Subscription.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/commafeed/frontend/model/Subscription.java b/src/main/java/com/commafeed/frontend/model/Subscription.java index 409647fd..2382d002 100644 --- a/src/main/java/com/commafeed/frontend/model/Subscription.java +++ b/src/main/java/com/commafeed/frontend/model/Subscription.java @@ -34,7 +34,7 @@ public class Subscription implements Serializable { sub.setFeedLink(feed.getLink()); sub.setLastRefresh(feed.getLastUpdated()); sub.setNextRefresh((feed.getDisabledUntil() != null && feed - .getDisabledUntil().before(now)) ? now : feed + .getDisabledUntil().before(now)) ? null : feed .getDisabledUntil()); sub.setUnread(unreadCount); sub.setCategoryId(category == null ? null : String.valueOf(category @@ -57,7 +57,7 @@ public class Subscription implements Serializable { @ApiProperty(value = "last time the feed was refreshed", required = true) private Date lastRefresh; - @ApiProperty(value = "next time the feed refresh is planned", required = true) + @ApiProperty(value = "next time the feed refresh is planned, null if refresh is already queued", required = true) private Date nextRefresh; @ApiProperty(value = "this subscription's feed url", required = true)