garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

don't crash if we cannot evaluate the filter

Browse Source
This commit is contained in:
Athou
2014-11-04 16:19:50 +01:00
parent 8f2ba5e186
commit c8fded3c56
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/commafeed/backend/service/FeedUpdateService.java
View File

@@ -7,6 +7,7 @@ import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.codec.digest.DigestUtils;
@@ -19,6 +20,7 @@ import com.commafeed.backend.model.FeedEntryContent;
import com.commafeed.backend.model.FeedEntryStatus; import com.commafeed.backend.model.FeedEntryStatus;
import com.commafeed.backend.model.FeedSubscription; import com.commafeed.backend.model.FeedSubscription;
@Slf4j
@RequiredArgsConstructor(onConstructor = @__({ @Inject })) @RequiredArgsConstructor(onConstructor = @__({ @Inject }))
@Singleton @Singleton
public class FeedUpdateService { public class FeedUpdateService {
@@ -47,7 +49,13 @@ public class FeedUpdateService {
// if filter does not match the entry, mark it as read // if filter does not match the entry, mark it as read
for (FeedSubscription sub : subscriptions) { for (FeedSubscription sub : subscriptions) {
FeedEntryFilter filter = new FeedEntryFilter(sub.getFilter()); FeedEntryFilter filter = new FeedEntryFilter(sub.getFilter());
if (!filter.matchesEntry(entry)) { boolean matches = true;
try {
matches = filter.matchesEntry(entry);
} catch (Exception e) {
log.error("could not evaluate filter {}", sub.getFilter(), e);
}
if (!matches) {
FeedEntryStatus status = new FeedEntryStatus(sub.getUser(), sub, entry); FeedEntryStatus status = new FeedEntryStatus(sub.getUser(), sub, entry);
status.setRead(true); status.setRead(true);
feedEntryStatusDAO.saveOrUpdate(status); feedEntryStatusDAO.saveOrUpdate(status);